diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2000-08-06 08:07:53 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2000-08-06 08:07:53 +0200 |
| commit | 1a9db204f578e99486280ebfffada02677b1296a (patch) | |
| tree | a5ad2bfde21ec22fac957b8a436d1b956a746796 /include | |
| parent | Document util_charset.h using ScanDoc (diff) | |
| download | apache2-1a9db204f578e99486280ebfffada02677b1296a.tar.xz apache2-1a9db204f578e99486280ebfffada02677b1296a.zip | |
Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
see src/lib/apr/apr_compat.h for most details.
Also a few minor nits to get Win32 to build.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_config.h | 2 | ||||
| -rw-r--r-- | include/mpm_common.h | 4 | ||||
| -rw-r--r-- | include/util_md5.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/ap_config.h b/include/ap_config.h index 76b470c542..4e646e7350 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -56,7 +56,7 @@ #define AP_AC_CONFIG_H #include "ap_mmn.h" /* MODULE_MAGIC_NUMBER_ */ -#include "apr_lib.h" /* ap_isfoo() macros */ +#include "apr_lib.h" /* apr_isfoo() macros */ /* Implemented flags for dynamic library bindings. * diff --git a/include/mpm_common.h b/include/mpm_common.h index 7be905280c..2eb8ecbc02 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -105,7 +105,7 @@ void ap_reclaim_child_processes(int terminate); * @param ret The process id of the process that died * @param p The pool to allocate out of */ -void ap_wait_or_timeout(ap_wait_t *status, apr_proc_t *ret, apr_pool_t *p); +void ap_wait_or_timeout(apr_wait_t *status, apr_proc_t *ret, apr_pool_t *p); /** * Log why a child died to the error log, if the child died without the @@ -113,7 +113,7 @@ void ap_wait_or_timeout(ap_wait_t *status, apr_proc_t *ret, apr_pool_t *p); * @param pid The child that has died * @param status The status returned from ap_wait_or_timeout */ -void ap_process_child_status(apr_proc_t *pid, ap_wait_t status); +void ap_process_child_status(apr_proc_t *pid, apr_wait_t status); #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF) /** diff --git a/include/util_md5.h b/include/util_md5.h index 7d2896d3c6..94721e86f9 100644 --- a/include/util_md5.h +++ b/include/util_md5.h @@ -67,7 +67,7 @@ extern "C" { API_EXPORT(char *) ap_md5(apr_pool_t *a, const unsigned char *string); API_EXPORT(char *) ap_md5_binary(apr_pool_t *a, const unsigned char *buf, int len); -API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *p, ap_md5_ctx_t *context); +API_EXPORT(char *) ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context); #ifdef APACHE_XLATE API_EXPORT(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile, apr_xlate_t *xlate); |