You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/05/28 00:53:49 UTC
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.
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,decline) \
-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
Index: http_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- http_config.h 2000/05/27 22:40:20 1.24
+++ http_config.h 2000/05/27 22:53:46 1.25
@@ -424,12 +424,12 @@
#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
}
1.18 +2 -2 apache-2.0/src/include/http_connection.h
Index: http_connection.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_connection.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- http_connection.h 2000/05/27 05:27:33 1.17
+++ http_connection.h 2000/05/27 22:53:47 1.18
@@ -74,8 +74,8 @@
#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
}
1.15 +4 -4 apache-2.0/src/include/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- http_protocol.h 2000/05/27 05:27:33 1.14
+++ http_protocol.h 2000/05/27 22:53:47 1.15
@@ -227,10 +227,10 @@
* 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
}
1.11 +6 -6 apache-2.0/src/include/http_request.h
Index: http_request.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_request.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- http_request.h 2000/05/27 05:27:34 1.10
+++ http_request.h 2000/05/27 22:53:47 1.11
@@ -114,12 +114,12 @@
#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
}
1.53 +4 -4 apache-2.0/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- http_config.c 2000/05/27 22:40:27 1.52
+++ http_config.c 2000/05/27 22:53:48 1.53
@@ -100,15 +100,15 @@
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))
/****************************************************************
1.36 +2 -4 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- http_connection.c 2000/05/27 05:27:37 1.35
+++ http_connection.c 2000/05/27 22:53:48 1.36
@@ -72,10 +72,8 @@
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,
1.72 +4 -4 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- http_protocol.c 2000/05/27 05:27:37 1.71
+++ http_protocol.c 2000/05/27 22:53:48 1.72
@@ -2898,11 +2898,11 @@
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)
1.28 +6 -6 apache-2.0/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- http_request.c 2000/05/27 05:27:37 1.27
+++ http_request.c 2000/05/27 22:53:48 1.28
@@ -87,17 +87,17 @@
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)
/*****************************************************************
RE: cvs commit: apache-2.0/src/main http_config.c http_connection.c http_protocol.c http_request.c
Posted by "William A. Rowe, Jr." <wr...@lnd.com>.
> -----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
>