Commit 5f9700c0 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  The big change.  This is part 3 of the apr-util symbols rename, please
  see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


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

Apache.dsw

+6 −0
Original line number Diff line number Diff line
@@ -182,6 +182,12 @@ Package=<5> 


Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name apr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name aprutil

    End Project Dependency

}}}



###############################################################################

include/ap_config.h

+9 −13
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


#include "ap_mmn.h"		/* MODULE_MAGIC_NUMBER_ */

#include "apr_lib.h"		/* apr_isfoo() macros */

#include "ap_hooks.h"

#include "apr_hooks.h"



/**

 * AP_DECLARE_EXPORT is defined when building the Apache Core dynamic
@@ -133,15 +133,11 @@ 
#define AP_MODULE_DECLARE_DATA __declspec(dllexport)

#endif



/* XXX: Must go away, perhaps into compat, maybe not even there.

 */

#define MODULE_VAR_EXPORT    AP_MODULE_DECLARE_DATA



#define AP_DECLARE_HOOK(ret,name,args) \

AP_DECLARE_EXTERNAL_HOOK(AP,ret,name,args)

APR_DECLARE_EXTERNAL_HOOK(ap,AP,ret,name,args)



#define AP_IMPLEMENT_HOOK_BASE(name) \

AP_IMPLEMENT_EXTERNAL_HOOK_BASE(AP,name)

APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name)



/**

 * Implement an Apache core hook that has no return code, and therefore
@@ -151,10 +147,10 @@ AP_IMPLEMENT_EXTERNAL_HOOK_BASE(AP,name) 
 * @param args_used The names for the arguments for the hook

 * @deffunc void AP_IMPLEMENT_HOOK_VOID(name, args_decl, args_use)

 * @tip If IMPLEMENTing a hook that is not linked into the Apache core,

 * (e.g. within a dso) see AP_IMPLEMENT_EXTERNAL_HOOK_HOOK_VOID.

 * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_HOOK_VOID.

 */

#define AP_IMPLEMENT_HOOK_VOID(name,args_decl,args_use) \

AP_IMPLEMENT_EXTERNAL_HOOK_VOID(AP,name,args_decl,args_use)

APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use)



/**

 * Implement an Apache core hook that runs until one of the functions
@@ -164,10 +160,10 @@ AP_IMPLEMENT_EXTERNAL_HOOK_VOID(AP,name,args_decl,args_use) 
 * @param args_used The names for the arguments for the hook

 * @deffunc int AP_IMPLEMENT_HOOK_RUN_ALL(name, args_decl, args_use)

 * @tip If IMPLEMENTing a hook that is not linked into the Apache core,

 * (e.g. within a dso) see AP_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL.

 * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL.

 */

#define AP_IMPLEMENT_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok,decline) \

AP_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(AP,ret,name,args_decl,args_use,ok,decline)

APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl,args_use,ok,decline)



/**

 * Implement a hook that runs until the first function returns something
@@ -177,10 +173,10 @@ AP_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(AP,ret,name,args_decl,args_use,ok,decline) 
 * @param args_used The names for the arguments for the hook

 * @deffunc int AP_IMPLEMENT_HOOK_RUN_FIRST(name, args_decl, args_use)

 * @tip If IMPLEMENTing a hook that is not linked into the Apache core

 * (e.g. within a dso) see AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST.

 * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST.

 */

#define AP_IMPLEMENT_HOOK_RUN_FIRST(ret,name,args_decl,args_use,decline) \

AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(AP,ret,name,args_decl,args_use,decline)

APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline)



#ifdef WIN32

#include "os.h"

include/ap_mmn.h

+5 −5
Original line number Diff line number Diff line
@@ -221,11 +221,11 @@ 
 * 19990320.3           - add ap_regexec() and ap_regerror()

 * 19990320.4           - add ap_field_noparam()

 * 19990320.5           - add local_ip/host to conn_rec for mass-vhost

 * 19990320.6           - add ap_SHA1Final(), ap_SHA1Init(),

 *                        ap_SHA1Update_binary(), ap_SHA1Update(),

 *                        ap_base64encode(), ap_base64encode_binary(),

 *                        ap_base64encode_len(), ap_base64decode(),

 *                        ap_base64decode_binary(), ap_base64decode_len(),

 * 19990320.6           - add apr_SHA1Final(), apr_SHA1Init(),

 *                        apr_SHA1Update_binary(), apr_SHA1Update(),

 *                        apr_base64encode(), apr_base64encode_binary(),

 *                        apr_base64encode_len(), apr_base64decode(),

 *                        apr_base64decode_binary(), apr_base64decode_len(),

 *                        ap_pbase64decode(), ap_pbase64encode()

 */

include/http_config.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#ifndef APACHE_HTTP_CONFIG_H

#define APACHE_HTTP_CONFIG_H



#include "ap_hooks.h"

#include "apr_hooks.h"

#include "util_cfgtree.h"



#ifdef __cplusplus

include/http_connection.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#ifndef APACHE_HTTP_CONNECTION_H

#define APACHE_HTTP_CONNECTION_H



#include "ap_hooks.h"

#include "apr_hooks.h"

#include "apr_network_io.h"



#ifdef __cplusplus