diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2009-12-21 21:25:45 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2009-12-21 21:25:45 +0000 |
| commit | 01cbd85e1c0a3d4fca012e601211f7f2139a9c8c (patch) | |
| tree | c8f2f04071a2b06f2f4493dae9860e48410af5e6 /dbd | |
| parent | adab42e39c1c2a3ce5bf9a92e76ab59e42a959f1 (diff) | |
| download | apr-01cbd85e1c0a3d4fca012e601211f7f2139a9c8c.tar.gz | |
Refactor away apu_version legacy cruft
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@892984 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd')
| -rw-r--r-- | dbd/apr_dbd.c | 5 | ||||
| -rw-r--r-- | dbd/apr_dbd_mysql.c | 1 | ||||
| -rw-r--r-- | dbd/apr_dbd_odbc.c | 16 |
3 files changed, 10 insertions, 12 deletions
diff --git a/dbd/apr_dbd.c b/dbd/apr_dbd.c index 656870320..9d2738100 100644 --- a/dbd/apr_dbd.c +++ b/dbd/apr_dbd.c @@ -30,7 +30,6 @@ #include "apu_internal.h" #include "apr_dbd_internal.h" #include "apr_dbd.h" -#include "apu_version.h" static apr_hash_t *drivers = NULL; static apr_uint32_t initialised = 0, in_init = 1; @@ -185,10 +184,10 @@ APR_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name, apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name); #elif defined(WIN32) apr_snprintf(modname, sizeof(modname), - "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name); + "apr_dbd_%s-" APR_STRINGIFY(APR_MAJOR_VERSION) ".dll", name); #else apr_snprintf(modname, sizeof(modname), - "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so", name); + "apr_dbd_%s-" APR_STRINGIFY(APR_MAJOR_VERSION) ".so", name); #endif apr_snprintf(symname, sizeof(symname), "apr_dbd_%s_driver", name); rv = apu_dso_load(NULL, &symbol, modname, symname, pool); diff --git a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c index fdd14f6f2..7cad22d6f 100644 --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c @@ -18,7 +18,6 @@ #if APU_HAVE_MYSQL -#include "apu_version.h" #include "apr_private.h" #include <ctype.h> diff --git a/dbd/apr_dbd_odbc.c b/dbd/apr_dbd_odbc.c index 552ecbf93..66e8bff13 100644 --- a/dbd/apr_dbd_odbc.c +++ b/dbd/apr_dbd_odbc.c @@ -26,7 +26,7 @@ #include "apr_file_info.h" #include "apr_dbd_internal.h" #include "apr_thread_proc.h" -#include "apu_version.h" +#include "apr_version.h" #include <stdlib.h> @@ -949,18 +949,18 @@ static void odbc_init(apr_pool_t *pool) { SQLRETURN rc; char *step; - apr_version_t apuver; + apr_version_t aprver; - apu_version(&apuver); - if (apuver.major != DRIVER_APU_VERSION_MAJOR - || apuver.minor != DRIVER_APU_VERSION_MINOR) { + apr_version(&aprver); + if (aprver.major != DRIVER_APR_VERSION_MAJOR + || aprver.minor != DRIVER_APR_VERSION_MINOR) { apr_file_t *se; apr_file_open_stderr(&se, pool); apr_file_printf(se, "Incorrect " ODBC_DRIVER_STRING " dbd driver version\n" - "Attempt to load APU version %d.%d driver with APU version %d.%d\n", - DRIVER_APU_VERSION_MAJOR, DRIVER_APU_VERSION_MINOR, - apuver.major, apuver.minor); + "Attempt to load APR version %d.%d driver with APR version %d.%d\n", + DRIVER_APR_VERSION_MAJOR, DRIVER_APR_VERSION_MINOR, + aprver.major, aprver.minor); abort(); } |