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 2008/05/23 18:45:32 UTC
svn commit: r659592 - in /apr/apr-util/branches/1.3.x: dbd/apr_dbd.c
ldap/apr_ldap_init.c ldap/apr_ldap_option.c ldap/apr_ldap_rebind.c
misc/apu_dso.c test/testxlate.c
Author: wrowe
Date: Fri May 23 09:45:31 2008
New Revision: 659592
URL: http://svn.apache.org/viewvc?rev=659592&view=rev
Log:
Fix ifdef tests where the flags are booleans.
Noted by: bnicholes
Backports: r659591
Modified:
apr/apr-util/branches/1.3.x/dbd/apr_dbd.c
apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c
apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c
apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c
apr/apr-util/branches/1.3.x/misc/apu_dso.c
apr/apr-util/branches/1.3.x/test/testxlate.c
Modified: apr/apr-util/branches/1.3.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/apr_dbd.c?rev=659592&r1=659591&r2=659592&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.3.x/dbd/apr_dbd.c Fri May 23 09:45:31 2008
@@ -62,7 +62,7 @@
}
#endif
-#ifndef APU_DSO_BUILD
+#if !APU_DSO_BUILD
#define DRIVER_LOAD(name,driver,pool) \
{ \
extern const apr_dbd_driver_t driver; \
@@ -107,7 +107,7 @@
/* This already registers a pool cleanup */
#endif
-#ifndef APU_DSO_BUILD
+#if !APU_DSO_BUILD
/* Load statically-linked drivers: */
#if APU_HAVE_MYSQL
DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool);
@@ -138,7 +138,7 @@
APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
const apr_dbd_driver_t **driver)
{
-#ifdef APU_DSO_BUILD
+#if APU_DSO_BUILD
char modname[32];
char symname[34];
apr_dso_handle_sym_t symbol;
@@ -156,7 +156,7 @@
return APR_SUCCESS;
}
-#ifdef APU_DSO_BUILD
+#if APU_DSO_BUILD
/* The driver DSO must have exactly the same lifetime as the
* drivers hash table; ignore the passed-in pool */
pool = apr_hash_pool_get(drivers);
Modified: apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c?rev=659592&r1=659591&r2=659592&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_init.c Fri May 23 09:45:31 2008
@@ -26,7 +26,7 @@
#include "apu.h"
#include "apu_config.h"
-#ifdef APU_DSO_BUILD
+#if APU_DSO_BUILD
#define APU_DSO_LDAP_BUILD
#endif
Modified: apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c?rev=659592&r1=659591&r2=659592&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_option.c Fri May 23 09:45:31 2008
@@ -25,7 +25,7 @@
#include "apu.h"
#include "apu_config.h"
-#ifdef APU_DSO_BUILD
+#if APU_DSO_BUILD
#define APU_DSO_LDAP_BUILD
#endif
@@ -166,7 +166,7 @@
break;
case APR_LDAP_OPT_REFHOPLIMIT:
-#if !defined(LDAP_OPT_REFHOPLIMIT) || defined(APR_HAS_NOVELL_LDAPSDK)
+#if !defined(LDAP_OPT_REFHOPLIMIT) || APR_HAS_NOVELL_LDAPSDK
/* If the LDAP_OPT_REFHOPLIMIT symbol is missing, assume that the
* particular LDAP library has a reasonable default. So far certain
* versions of the OpenLDAP SDK miss this symbol (but default to 5),
Modified: apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c?rev=659592&r1=659591&r2=659592&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_rebind.c Fri May 23 09:45:31 2008
@@ -25,7 +25,7 @@
#include "apu.h"
#include "apu_config.h"
-#ifdef APU_DSO_BUILD
+#if APU_DSO_BUILD
#define APU_DSO_LDAP_BUILD
#endif
Modified: apr/apr-util/branches/1.3.x/misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/misc/apu_dso.c?rev=659592&r1=659591&r2=659592&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/misc/apu_dso.c (original)
+++ apr/apr-util/branches/1.3.x/misc/apu_dso.c Fri May 23 09:45:31 2008
@@ -38,7 +38,7 @@
static apr_hash_t *dsos = NULL;
-#if defined(APR_HAS_THREADS) && defined(APU_DSO_BUILD)
+#if APR_HAS_THREADS && APU_DSO_BUILD
apr_status_t apu_dso_mutex_lock()
{
return apr_thread_mutex_lock(mutex);
@@ -79,7 +79,7 @@
apr_pool_t *global;
apr_pool_t *parent;
-#ifdef APU_DSO_BUILD
+#if APU_DSO_BUILD
/* Top level pool scope, need process-scope lifetime */
for (parent = global = pool; parent; parent = apr_pool_parent_get(global))
global = parent;
@@ -104,7 +104,7 @@
apr_status_t apu_dso_load(apr_dso_handle_sym_t *dsoptr, const char *module,
const char *modsym, apr_pool_t *pool)
{
-#ifndef APU_DSO_BUILD
+#if !APU_DSO_BUILD
return APR_ENOTIMPL;
#else
apr_dso_handle_t *dlhandle = NULL;
Modified: apr/apr-util/branches/1.3.x/test/testxlate.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/testxlate.c?rev=659592&r1=659591&r2=659592&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/testxlate.c (original)
+++ apr/apr-util/branches/1.3.x/test/testxlate.c Fri May 23 09:45:31 2008
@@ -22,7 +22,7 @@
#include "abts.h"
#include "testutil.h"
-#ifdef APR_HAS_XLATE
+#if APR_HAS_XLATE
static const char test_utf8[] = "Edelwei\xc3\x9f";
static const char test_utf7[] = "Edelwei+AN8-";
@@ -95,7 +95,7 @@
{
suite = ADD_SUITE(suite);
-#ifdef APR_HAS_XLATE
+#if APR_HAS_XLATE
abts_run_test(suite, test_transformation, NULL);
#endif