diff options
| author | Nick Kew <niq@apache.org> | 2013-03-30 14:50:01 +0000 |
|---|---|---|
| committer | Nick Kew <niq@apache.org> | 2013-03-30 14:50:01 +0000 |
| commit | 50cf4516ef711ef6e808aad1d367017e35757577 (patch) | |
| tree | c93335603e212c9261baeb2924bd87beec5d0f7d /dbd | |
| parent | fac9b93dfaf980f8f8c9106545a7331adf7a7d1e (diff) | |
| download | apr-50cf4516ef711ef6e808aad1d367017e35757577.tar.gz | |
Mark apr_dbd_freetds as unsupported and remove it from all builds
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1462772 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd')
| -rw-r--r-- | dbd/NWGNUmakefile | 3 | ||||
| -rw-r--r-- | dbd/apr_dbd.c | 3 | ||||
| -rw-r--r-- | dbd/unsupported/NWGNUdbdfreetds (renamed from dbd/NWGNUdbdfreetds) | 0 | ||||
| -rw-r--r-- | dbd/unsupported/apr_dbd_freetds.c (renamed from dbd/apr_dbd_freetds.c) | 4 | ||||
| -rw-r--r-- | dbd/unsupported/apr_dbd_freetds.dsp (renamed from dbd/apr_dbd_freetds.dsp) | 0 |
5 files changed, 4 insertions, 6 deletions
diff --git a/dbd/NWGNUmakefile b/dbd/NWGNUmakefile index 6bb7c610d..90f8aae20 100644 --- a/dbd/NWGNUmakefile +++ b/dbd/NWGNUmakefile @@ -166,9 +166,6 @@ endif ifeq "$(APU_HAVE_SQLITE3)" "1" TARGET_nlm += $(OBJDIR)/dbdsqli3.nlm $(OBJDIR)/dbdsqli3.nlm $(EOLIST) endif -ifeq "$(APU_HAVE_FREETDS)" "1" -TARGET_nlm += $(OBJDIR)/dbdfreetds.nlm $(OBJDIR)/dbdfreetds.nlm $(EOLIST) -endif # # If there is an LIB target, put it here diff --git a/dbd/apr_dbd.c b/dbd/apr_dbd.c index 7f6f26ab1..7434badc1 100644 --- a/dbd/apr_dbd.c +++ b/dbd/apr_dbd.c @@ -133,9 +133,6 @@ APR_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool) #if APU_HAVE_ORACLE DRIVER_LOAD("oracle", apr_dbd_oracle_driver, pool); #endif -#if APU_HAVE_FREETDS - DRIVER_LOAD("freetds", apr_dbd_freetds_driver, pool); -#endif #if APU_HAVE_ODBC DRIVER_LOAD("odbc", apr_dbd_odbc_driver, pool); #endif diff --git a/dbd/NWGNUdbdfreetds b/dbd/unsupported/NWGNUdbdfreetds index 71af8d151..71af8d151 100644 --- a/dbd/NWGNUdbdfreetds +++ b/dbd/unsupported/NWGNUdbdfreetds diff --git a/dbd/apr_dbd_freetds.c b/dbd/unsupported/apr_dbd_freetds.c index 167a8b863..ba952e95b 100644 --- a/dbd/apr_dbd_freetds.c +++ b/dbd/unsupported/apr_dbd_freetds.c @@ -14,6 +14,8 @@ * limitations under the License. */ +#ifdef I_CAN_DEAL_WITH_THIS_PARTIAL_DRIVER_AND_UNMAINTAINED_CODE_FOR_FREETDS + #include "apu.h" #include "apr_private.h" @@ -803,3 +805,5 @@ APR_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = { #endif }; #endif + +#endif diff --git a/dbd/apr_dbd_freetds.dsp b/dbd/unsupported/apr_dbd_freetds.dsp index f69ffac4b..f69ffac4b 100644 --- a/dbd/apr_dbd_freetds.dsp +++ b/dbd/unsupported/apr_dbd_freetds.dsp |