diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2009-12-17 19:00:08 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2009-12-17 19:00:08 +0000 |
| commit | afd3caca42cf5a179419f2f1f3d6c08188d9b3b7 (patch) | |
| tree | c64885f91fd6ac376f20e101473211ab69e9045b | |
| parent | 4bda27aa24939120945009a111f2bac790df8202 (diff) | |
| download | apr-afd3caca42cf5a179419f2f1f3d6c08188d9b3b7.tar.gz | |
Two missed APU_MODULE_DECLARE_DATA fixes
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@891841 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | crypto/apr_crypto.c | 3 | ||||
| -rw-r--r-- | crypto/apr_crypto_nss.c | 5 | ||||
| -rw-r--r-- | crypto/apr_crypto_openssl.c | 5 | ||||
| -rw-r--r-- | crypto/apr_md5.c | 2 | ||||
| -rw-r--r-- | dbd/apr_dbd_odbc.c | 2 | ||||
| -rw-r--r-- | docs/doxygen.conf | 2 |
6 files changed, 8 insertions, 11 deletions
diff --git a/crypto/apr_crypto.c b/crypto/apr_crypto.c index 9b596affe..31a8cf0b8 100644 --- a/crypto/apr_crypto.c +++ b/crypto/apr_crypto.c @@ -17,9 +17,8 @@ #include <ctype.h> #include <stdio.h> -#include "apu_config.h" #include "apu.h" - +#include "apr_private.h" #include "apr_pools.h" #include "apr_dso.h" #include "apr_strings.h" diff --git a/crypto/apr_crypto_nss.c b/crypto/apr_crypto_nss.c index d63c7427d..22673c54e 100644 --- a/crypto/apr_crypto_nss.c +++ b/crypto/apr_crypto_nss.c @@ -15,8 +15,7 @@ */ #include "apu.h" - -#include "apu_config.h" +#include "apr_private.h" #include "apu_errno.h" #include <ctype.h> @@ -775,7 +774,7 @@ static apr_status_t crypto_block_decrypt_finish(apr_crypto_block_t *block, /** * OpenSSL module. */ -APU_MODULE_DECLARE_DATA const apr_crypto_driver_t apr_crypto_nss_driver = { +APR_MODULE_DECLARE_DATA const apr_crypto_driver_t apr_crypto_nss_driver = { "nss", crypto_init, crypto_error, diff --git a/crypto/apr_crypto_openssl.c b/crypto/apr_crypto_openssl.c index 6870d965f..48f91bdda 100644 --- a/crypto/apr_crypto_openssl.c +++ b/crypto/apr_crypto_openssl.c @@ -15,8 +15,7 @@ */ #include "apu.h" - -#include "apu_config.h" +#include "apr_private.h" #include "apu_errno.h" #include <ctype.h> @@ -654,7 +653,7 @@ static apr_status_t crypto_block_decrypt_finish(apr_crypto_block_t *ctx, /** * OpenSSL module. */ -APU_MODULE_DECLARE_DATA const apr_crypto_driver_t apr_crypto_openssl_driver = { +APR_MODULE_DECLARE_DATA const apr_crypto_driver_t apr_crypto_openssl_driver = { "openssl", crypto_init, crypto_error, crypto_make, crypto_passphrase, crypto_block_encrypt_init, crypto_block_encrypt, crypto_block_encrypt_finish, crypto_block_decrypt_init, diff --git a/crypto/apr_md5.c b/crypto/apr_md5.c index 5a18fc4c2..f52bd0fd4 100644 --- a/crypto/apr_md5.c +++ b/crypto/apr_md5.c @@ -60,7 +60,7 @@ #include "apr_strings.h" #include "apr_md5.h" #include "apr_lib.h" -#include "apu_config.h" +#include "apr_private.h" #include "apr_sha1.h" #if APR_HAVE_STRING_H diff --git a/dbd/apr_dbd_odbc.c b/dbd/apr_dbd_odbc.c index a69e7e376..552ecbf93 100644 --- a/dbd/apr_dbd_odbc.c +++ b/dbd/apr_dbd_odbc.c @@ -1637,7 +1637,7 @@ static int odbc_pvbselect(apr_pool_t * pool, apr_dbd_t * handle, return odbc_pbselect(pool, handle, res, statement, random, (const void **) values); } -APU_MODULE_DECLARE_DATA const apr_dbd_driver_t ODBC_DRIVER_ENTRY = { +APR_MODULE_DECLARE_DATA const apr_dbd_driver_t ODBC_DRIVER_ENTRY = { ODBC_DRIVER_STRING, odbc_init, odbc_native_handle, diff --git a/docs/doxygen.conf b/docs/doxygen.conf index cfdf1288a..86145a4d0 100644 --- a/docs/doxygen.conf +++ b/docs/doxygen.conf @@ -19,9 +19,9 @@ PREDEFINED="APR_DECLARE(x)=x" \ "APR_DECLARE_INHERIT_SET(x)=apr_status_t apr_##x##_inherit_set(apr_##x##_t *the##x)" \ "APR_DECLARE_INHERIT_UNSET(x)=apr_status_t apr_##x##_inherit_unset(apr_##x##_t *the##x)" \ "APR_HAS_THREADS" \ - "APU_MODULE_DECLARE_DATA" \ "APR_HAS_MMAP" \ "APR_HAS_XLATE" \ + "APR_MODULE_DECLARE_DATA" \ "__attribute__(x)=" \ DOXYGEN= |