PR:

Obtained from:
Submitted by:
Reviewed by:

  Reverse out additional linkage argument from DECLARE_HOOK
  and IMPLEMENT_HOOK macros.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85319 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_config.h b/include/http_config.h
index 94f9dd848305e2dbcb7fe4ea8facd31dbf969c38..32f17eebaaa14434200b571f1416235f023af4a1 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -424,12 +424,12 @@ CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, cons
 #endif
 
   /* Hooks */
-AP_DECLARE_HOOK(API_EXPORT,int,header_parser,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,void,post_config,
+AP_DECLARE_HOOK(int,header_parser,(request_rec *))
+AP_DECLARE_HOOK(void,post_config,
             (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
-AP_DECLARE_HOOK(API_EXPORT,void,open_logs,
+AP_DECLARE_HOOK(void,open_logs,
             (ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp,server_rec *s))
-AP_DECLARE_HOOK(API_EXPORT,void,child_init,(ap_pool_t *pchild, server_rec *s))
+AP_DECLARE_HOOK(void,child_init,(ap_pool_t *pchild, server_rec *s))
 
 #ifdef __cplusplus
 }

diff --git a/include/http_connection.h b/include/http_connection.h
index dafc5c493472f55676b3b70ad3cefb8ea6e4dc20..cb504534ef15ceaae1a2b9c65c4aadd20a205e6e 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -74,8 +74,8 @@ void ap_lingering_close(conn_rec *);
 #endif
 
   /* Hooks */
-AP_DECLARE_HOOK(API_EXPORT,int,pre_connection,(conn_rec *))
-AP_DECLARE_HOOK(API_EXPORT,int,process_connection,(conn_rec *))
+AP_DECLARE_HOOK(int,pre_connection,(conn_rec *))
+AP_DECLARE_HOOK(int,process_connection,(conn_rec *))
 
 #ifdef __cplusplus
 }

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 5c995cebaa185796449c23d1cfcf56d2abc2c2bc..ea1b59ab4bcd3f27428053088119cfff8ea61bed 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -227,10 +227,10 @@ API_EXPORT(int) ap_method_number_of(const char *method);
    * post_read_request --- run right after read_request or internal_redirect,
    *                  and not run during any subrequests.
    */
-AP_DECLARE_HOOK(API_EXPORT,int,post_read_request,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,int,log_transaction,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,const char *,http_method,(const request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,unsigned short,default_port,(const request_rec *))
+AP_DECLARE_HOOK(int,post_read_request,(request_rec *))
+AP_DECLARE_HOOK(int,log_transaction,(request_rec *))
+AP_DECLARE_HOOK(const char *,http_method,(const request_rec *))
+AP_DECLARE_HOOK(unsigned short,default_port,(const request_rec *))
 
 #ifdef __cplusplus
 }

diff --git a/include/http_request.h b/include/http_request.h
index 30051f56fe0d8c6cfd2b104fe48a3ae1be5a7c6b..57630c15d194813d599c8b49104259d6db55c9f5 100644 (file)
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -114,12 +114,12 @@ API_EXPORT(void) ap_die(int type, request_rec *r);
 #endif
 
   /* Hooks */
-AP_DECLARE_HOOK(API_EXPORT,int,translate_name,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,int,check_user_id,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,int,fixups,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,int,type_checker,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,int,access_checker,(request_rec *))
-AP_DECLARE_HOOK(API_EXPORT,int,auth_checker,(request_rec *))
+AP_DECLARE_HOOK(int,translate_name,(request_rec *))
+AP_DECLARE_HOOK(int,check_user_id,(request_rec *))
+AP_DECLARE_HOOK(int,fixups,(request_rec *))
+AP_DECLARE_HOOK(int,type_checker,(request_rec *))
+AP_DECLARE_HOOK(int,access_checker,(request_rec *))
+AP_DECLARE_HOOK(int,auth_checker,(request_rec *))
 
 #ifdef __cplusplus
 }

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index d7a4ef681b72a21907fd495d6bfa5c1041a3b78a..20b120f8c72647840369ed88a402a816a9c86a02 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2898,11 +2898,11 @@ API_EXPORT(void) ap_send_error_response(request_rec *r, int recursive_error)
     ap_rflush(r);
 }
 
-AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,post_read_request,
+AP_IMPLEMENT_HOOK_RUN_ALL(int,post_read_request,
                           (request_rec *r),(r),OK,DECLINED)
-AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,log_transaction,
+AP_IMPLEMENT_HOOK_RUN_ALL(int,log_transaction,
                           (request_rec *r),(r),OK,DECLINED)
-AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,const char *,http_method,
+AP_IMPLEMENT_HOOK_RUN_FIRST(const char *,http_method,
                             (const request_rec *r),(r),NULL)
-AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,unsigned short,default_port,
+AP_IMPLEMENT_HOOK_RUN_FIRST(unsigned short,default_port,
                             (const request_rec *r),(r),0)

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 9566c2d326482cbc22db37039c9db942776d4741..92e266cfeeeac1aa6eb49480e5aa509d6e081a01 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -87,17 +87,17 @@ AP_HOOK_STRUCT(
            AP_HOOK_LINK(auth_checker)
 )
 
-AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,translate_name,
+AP_IMPLEMENT_HOOK_RUN_FIRST(int,translate_name,
                             (request_rec *r),(r),DECLINED)
-AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,check_user_id,
+AP_IMPLEMENT_HOOK_RUN_FIRST(int,check_user_id,
                             (request_rec *r),(r),DECLINED)
-AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,fixups,
+AP_IMPLEMENT_HOOK_RUN_ALL(int,fixups,
                           (request_rec *r),(r),OK,DECLINED)
-AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,type_checker,
+AP_IMPLEMENT_HOOK_RUN_FIRST(int,type_checker,
                             (request_rec *r),(r),DECLINED)
-AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,access_checker,
+AP_IMPLEMENT_HOOK_RUN_ALL(int,access_checker,
                           (request_rec *r),(r),OK,DECLINED)
-AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,auth_checker,
+AP_IMPLEMENT_HOOK_RUN_FIRST(int,auth_checker,
                             (request_rec *r),(r),DECLINED)
 
 /*****************************************************************

diff --git a/server/config.c b/server/config.c
index 4c496fbcc11964e2e09dcf0c7547879b1ecb9779..20b9feb1a0d717463109d58e2c72cce5c94c7bcf 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -100,15 +100,15 @@ AP_HOOK_STRUCT(
            AP_HOOK_LINK(child_init)
 )
 
-AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,header_parser,
+AP_IMPLEMENT_HOOK_RUN_ALL(int,header_parser,
                           (request_rec *r),(r),OK,DECLINED)
-AP_IMPLEMENT_HOOK_VOID(API_EXPORT,post_config,
+AP_IMPLEMENT_HOOK_VOID(post_config,
                       (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp,
                         server_rec *s),(pconf,plog,ptemp,s))
-AP_IMPLEMENT_HOOK_VOID(API_EXPORT,open_logs,
+AP_IMPLEMENT_HOOK_VOID(open_logs,
                       (ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, 
                         server_rec *s),(pconf,plog,ptemp,s))
-AP_IMPLEMENT_HOOK_VOID(API_EXPORT,child_init,
+AP_IMPLEMENT_HOOK_VOID(child_init,
                        (ap_pool_t *pchild, server_rec *s),(pchild,s))
 
 /****************************************************************

diff --git a/server/connection.c b/server/connection.c
index 1802ec93ef1b0ea0c9fdef81f21aa2e8bbd43d9f..1967107c5a9af9a61e2027a115214aec789c1d50 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -72,10 +72,8 @@ AP_HOOK_STRUCT(
            AP_HOOK_LINK(process_connection)
 )
 
-AP_IMPLEMENT_HOOK_RUN_ALL(API_EXPORT,int,pre_connection,
-                          (conn_rec *c),(c),OK,DECLINED)
-AP_IMPLEMENT_HOOK_RUN_FIRST(API_EXPORT,int,process_connection,
-                            (conn_rec *c),(c),DECLINED)
+AP_IMPLEMENT_HOOK_RUN_ALL(int,pre_connection,(conn_rec *c),(c),OK,DECLINED)
+AP_IMPLEMENT_HOOK_RUN_FIRST(int,process_connection,(conn_rec *c),(c),DECLINED)
 
 /*
  * More machine-dependent networking gooo... on some systems,