You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "William A. Rowe, Jr." <wr...@lnd.com> on 2000/05/28 00:57:11 UTC
RE: cvs commit: apache-2.0/src/main http_config.c http_connection.c http_protocol.c http_request.c
> -----Original Message-----
> From: wrowe@locus.apache.org [mailto:wrowe@locus.apache.org]
> Sent: Saturday, May 27, 2000 5:54 PM
> To: apache-2.0-cvs@apache.org
> Subject: cvs commit: apache-2.0/src/main http_config.c
> http_connection.c
> http_protocol.c http_request.c
>
>
> wrowe 00/05/27 15:53:49
>
> Modified: src/include ap.h ap_base64.h ap_hooks.h ap_sha1.h
> http_config.h http_connection.h
> http_protocol.h
> http_request.h
> src/main http_config.c http_connection.c
> http_protocol.c
> http_request.c
> Log:
> Reverse out additional linkage argument from DECLARE_HOOK
> and IMPLEMENT_HOOK macros.
Sorry, dropped two patches in one, the second cleans out ap.h
redundant declarations, and invokes ap_config.h from this set
of headers.
> Revision Changes Path
> 1.15 +0 -13 apache-2.0/src/include/ap.h
>
> Index: ap.h
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/include/ap.h,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -r1.14 -r1.15
> --- ap.h 2000/05/27 22:40:19 1.14
> +++ ap.h 2000/05/27 22:53:46 1.15
> @@ -60,19 +60,6 @@
> extern "C" {
> #endif
>
> -#if !defined(WIN32) || defined(AP_STATIC)
> -#define API_EXPORT(type) type
> -#define API_EXPORT_NONSTD(type) type
> -#define API_VAR_EXPORT
> -#elif defined(API_EXPORT_SYMBOLS)
> -#define API_EXPORT(type) __declspec(dllexport) type
> -#define API_EXPORT_NONSTD(type) __declspec(dllexport) type
> -#define API_VAR_EXPORT __declspec(dllexport)
> -#else
> -#define API_EXPORT(type) __declspec(dllimport) type
> -#define API_EXPORT_NONSTD(type) __declspec(dllimport) type
> -#define API_VAR_EXPORT __declspec(dllimport)
> -#endif
>
> #ifdef __cplusplus
> }
>
>
>
> 1.5 +1 -1 apache-2.0/src/include/ap_base64.h
>
> Index: ap_base64.h
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/include/ap_base64.h,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- ap_base64.h 2000/05/27 22:28:03 1.4
> +++ ap_base64.h 2000/05/27 22:53:46 1.5
> @@ -59,7 +59,7 @@
> #ifndef APACHE_BASE64_H
> #define APACHE_BASE64_H
>
> -#include "ap.h"
> +#include "ap_config.h"
>
> #ifdef __cplusplus
> extern "C" {
>
>
>
> 1.20 +15 -15 apache-2.0/src/include/ap_hooks.h
>
> Index: ap_hooks.h
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/include/ap_hooks.h,v
> retrieving revision 1.19
> retrieving revision 1.20
> diff -u -r1.19 -r1.20
> --- ap_hooks.h 2000/05/27 22:40:19 1.19
> +++ ap_hooks.h 2000/05/27 22:53:46 1.20
> @@ -55,16 +55,16 @@
> #ifndef APACHE_AP_HOOKS_H
> #define APACHE_AP_HOOKS_H
>
> -#include "ap.h"
> +#include "ap_config.h"
>
> /* For ap_array_header_t */
> #include "apr_lib.h"
>
> -#define AP_DECLARE_HOOK(impl,ret,name,args) \
> +#define AP_DECLARE_HOOK(ret,name,args) \
> typedef ret HOOK_##name args; \
> -impl(void) ap_hook_##name(HOOK_##name *pf,const char *
> const *aszPre, \
> +API_EXPORT(void) ap_hook_##name(HOOK_##name *pf,const char
> * const *aszPre, \
> const char * const *aszSucc,int nOrder); \
> -impl(ret) ap_run_##name args; \
> +API_EXPORT(ret) ap_run_##name args; \
> typedef struct _LINK_##name \
> { \
> HOOK_##name *pFunc; \
> @@ -80,8 +80,8 @@
> #define AP_HOOK_LINK(name) \
> ap_array_header_t *link_##name;
>
> -#define AP_IMPLEMENT_HOOK_BASE(impl,name) \
> -impl(void) ap_hook_##name(HOOK_##name *pf,const char *
> const *aszPre, \
> +#define AP_IMPLEMENT_HOOK_BASE(name) \
> +API_EXPORT(void) ap_hook_##name(HOOK_##name *pf,const char
> * const *aszPre, \
> const char * const *aszSucc,int nOrder) \
> { \
> LINK_##name *pHook; \
> @@ -105,9 +105,9 @@
> VOID runs all
> */
>
> -#define AP_IMPLEMENT_HOOK_VOID(impl,name,args_decl,args_use) \
> -AP_IMPLEMENT_HOOK_BASE(impl,name) \
> -impl(void) ap_run_##name args_decl \
> +#define AP_IMPLEMENT_HOOK_VOID(name,args_decl,args_use) \
> +AP_IMPLEMENT_HOOK_BASE(name) \
> +API_EXPORT(void) ap_run_##name args_decl \
> { \
> LINK_##name *pHook; \
> int n; \
> @@ -123,9 +123,9 @@
> /* FIXME: note that this returns ok when nothing is run. I
> suspect it should
> really return decline, but that breaks Apache currently - Ben
> */
> -#define
> AP_IMPLEMENT_HOOK_RUN_ALL(impl,ret,name,args_decl,args_use,ok,
> decline) \
> -AP_IMPLEMENT_HOOK_BASE(impl,name) \
> -impl(ret) ap_run_##name args_decl \
> +#define
> AP_IMPLEMENT_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok,decline) \
> +AP_IMPLEMENT_HOOK_BASE(name) \
> +API_EXPORT(ret) ap_run_##name args_decl \
> { \
> LINK_##name *pHook; \
> int n; \
> @@ -145,9 +145,9 @@
> return ok; \
> }
>
> -#define
> AP_IMPLEMENT_HOOK_RUN_FIRST(impl,ret,name,args_decl,args_use,d
> ecline) \
> -AP_IMPLEMENT_HOOK_BASE(impl,name) \
> -impl(ret) ap_run_##name args_decl \
> +#define
> AP_IMPLEMENT_HOOK_RUN_FIRST(ret,name,args_decl,args_use,decline) \
> +AP_IMPLEMENT_HOOK_BASE(name) \
> +API_EXPORT(ret) ap_run_##name args_decl \
> { \
> LINK_##name *pHook; \
> int n; \
>
>
>
> 1.8 +1 -1 apache-2.0/src/include/ap_sha1.h
>
> Index: ap_sha1.h
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/include/ap_sha1.h,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- ap_sha1.h 2000/05/27 22:28:03 1.7
> +++ ap_sha1.h 2000/05/27 22:53:46 1.8
> @@ -61,7 +61,7 @@
> #ifndef APACHE_SHA1_H
> #define APACHE_SHA1_H
>
> -#include "ap.h"
> +#include "ap_config.h"
>
> #ifdef __cplusplus
> extern "C" {
>
>
>
> 1.25 +4 -4 apache-2.0/src/include/http_config.h
>