ap.h is the basis for the ap.lib collection. Since it is a distinct

  package, this patch provides appropriate Win32 linkage resolution for
  its functions and data.

  The most significant change is in the ap_hooks.h declaration macros.
  These now require a first parameter of the linkage to be used.  There
  is no shared data, so only the hook-in and hook-run functions are
  affected.  Use the appropriate function export without the parens,
  for the core server this will be API_EXPORT (no variable args, and the
  functions are exported from the core server.)

  The patch to correct the resulting issues in the server core follows
  seperately.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@57805 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 20 insertions, 10 deletions

diff --git a/hooks/ap_hooks.c b/hooks/ap_hooks.c
index 79df96e3..e99a6e09 100644
--- a/hooks/ap_hooks.c
+++ b/hooks/ap_hooks.c
@@ -6,6 +6,10 @@
 #define ap_palloc(pool,size)	malloc(size)
 #endif
 
+AP_EXPORT_VAR ap_pool_t *g_pHookPool = NULL;
+AP_EXPORT_VAR int g_bDebugHooks = FALSE;
+AP_EXPORT_VAR const char *g_szCurrentHookName = NULL;
+
 /* NB: This must echo the LINK_##name structure */
 typedef struct
 {
@@ -144,7 +148,8 @@ typedef struct
     ap_array_header_t **paHooks;
 } HookSortEntry;
 
-void ap_hook_sort_register(const char *szHookName,ap_array_header_t **paHooks)
+AP_EXPORT(void) ap_hook_sort_register(const char *szHookName,
+                                      ap_array_header_t **paHooks)
 {
     HookSortEntry *pEntry;
 
@@ -155,7 +160,7 @@ void ap_hook_sort_register(const char *szHookName,ap_array_header_t **paHooks)
     pEntry->paHooks=paHooks;
 }
 
-void ap_sort_hooks()
+AP_EXPORT(void) ap_sort_hooks()
 {
     int n;
 
@@ -165,7 +170,7 @@ void ap_sort_hooks()
     }
 }
     
-void ap_hook_deregister_all(void)
+AP_EXPORT(void) ap_hook_deregister_all(void)
 {
     int n;    
 
@@ -176,8 +181,8 @@ void ap_hook_deregister_all(void)
     s_aHooksToSort=NULL;
 }
 
-void ap_show_hook(const char *szName,const char * const *aszPre,
-		  const char * const *aszSucc)
+AP_EXPORT(void) ap_show_hook(const char *szName,const char * const *aszPre,
+		             const char * const *aszSucc)
 {
     int nFirst;
 
diff --git a/hooks/apr_hooks.c b/hooks/apr_hooks.c
index 79df96e3..e99a6e09 100644
--- a/hooks/apr_hooks.c
+++ b/hooks/apr_hooks.c
@@ -6,6 +6,10 @@
 #define ap_palloc(pool,size)	malloc(size)
 #endif
 
+AP_EXPORT_VAR ap_pool_t *g_pHookPool = NULL;
+AP_EXPORT_VAR int g_bDebugHooks = FALSE;
+AP_EXPORT_VAR const char *g_szCurrentHookName = NULL;
+
 /* NB: This must echo the LINK_##name structure */
 typedef struct
 {
@@ -144,7 +148,8 @@ typedef struct
     ap_array_header_t **paHooks;
 } HookSortEntry;
 
-void ap_hook_sort_register(const char *szHookName,ap_array_header_t **paHooks)
+AP_EXPORT(void) ap_hook_sort_register(const char *szHookName,
+                                      ap_array_header_t **paHooks)
 {
     HookSortEntry *pEntry;
 
@@ -155,7 +160,7 @@ void ap_hook_sort_register(const char *szHookName,ap_array_header_t **paHooks)
     pEntry->paHooks=paHooks;
 }
 
-void ap_sort_hooks()
+AP_EXPORT(void) ap_sort_hooks()
 {
     int n;
 
@@ -165,7 +170,7 @@ void ap_sort_hooks()
     }
 }
     
-void ap_hook_deregister_all(void)
+AP_EXPORT(void) ap_hook_deregister_all(void)
 {
     int n;    
 
@@ -176,8 +181,8 @@ void ap_hook_deregister_all(void)
     s_aHooksToSort=NULL;
 }
 
-void ap_show_hook(const char *szName,const char * const *aszPre,
-		  const char * const *aszSucc)
+AP_EXPORT(void) ap_show_hook(const char *szName,const char * const *aszPre,
+		             const char * const *aszSucc)
 {
     int nFirst;