You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2009/12/17 20:00:09 UTC
svn commit: r891841 - in /apr/apr/trunk: crypto/apr_crypto.c
crypto/apr_crypto_nss.c crypto/apr_crypto_openssl.c crypto/apr_md5.c
dbd/apr_dbd_odbc.c docs/doxygen.conf
Author: wrowe
Date: Thu Dec 17 19:00:08 2009
New Revision: 891841
URL: http://svn.apache.org/viewvc?rev=891841&view=rev
Log:
Two missed APU_MODULE_DECLARE_DATA fixes
Modified:
apr/apr/trunk/crypto/apr_crypto.c
apr/apr/trunk/crypto/apr_crypto_nss.c
apr/apr/trunk/crypto/apr_crypto_openssl.c
apr/apr/trunk/crypto/apr_md5.c
apr/apr/trunk/dbd/apr_dbd_odbc.c
apr/apr/trunk/docs/doxygen.conf
Modified: apr/apr/trunk/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=891841&r1=891840&r2=891841&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto.c (original)
+++ apr/apr/trunk/crypto/apr_crypto.c Thu Dec 17 19:00:08 2009
@@ -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"
Modified: apr/apr/trunk/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_nss.c?rev=891841&r1=891840&r2=891841&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_nss.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_nss.c Thu Dec 17 19:00:08 2009
@@ -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 @@
/**
* 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,
Modified: apr/apr/trunk/crypto/apr_crypto_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_openssl.c?rev=891841&r1=891840&r2=891841&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_openssl.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_openssl.c Thu Dec 17 19:00:08 2009
@@ -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 @@
/**
* 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,
Modified: apr/apr/trunk/crypto/apr_md5.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_md5.c?rev=891841&r1=891840&r2=891841&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_md5.c (original)
+++ apr/apr/trunk/crypto/apr_md5.c Thu Dec 17 19:00:08 2009
@@ -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
Modified: apr/apr/trunk/dbd/apr_dbd_odbc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_odbc.c?rev=891841&r1=891840&r2=891841&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_odbc.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_odbc.c Thu Dec 17 19:00:08 2009
@@ -1637,7 +1637,7 @@
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,
Modified: apr/apr/trunk/docs/doxygen.conf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/docs/doxygen.conf?rev=891841&r1=891840&r2=891841&view=diff
==============================================================================
--- apr/apr/trunk/docs/doxygen.conf (original)
+++ apr/apr/trunk/docs/doxygen.conf Thu Dec 17 19:00:08 2009
@@ -19,9 +19,9 @@
"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=