Fix [-Wundef] warnings in DBA extension

Author: Girgias

ext/dba/dba.c

@@ -21,7 +21,7 @@
 
 #include "php.h"
 
-#if HAVE_DBA
+#ifdef HAVE_DBA
 
 #include "php_ini.h"
 #include <stdio.h>
@@ -160,72 +160,72 @@ static zend_string* php_dba_make_key(HashTable *key)
 /* {{{ globals */
 
 static dba_handler handler[] = {
-#if DBA_GDBM
+#ifdef DBA_GDBM
 	DBA_HND(gdbm, DBA_LOCK_EXT) /* Locking done in library if set */
 #endif
-#if DBA_DBM
+#ifdef DBA_DBM
 	DBA_HND(dbm, DBA_LOCK_ALL) /* No lock in lib */
 #endif
-#if DBA_NDBM
+#ifdef DBA_NDBM
 	DBA_HND(ndbm, DBA_LOCK_ALL) /* Could be done in library: filemode = 0644 + S_ENFMT */
 #endif
-#if DBA_CDB
+#ifdef DBA_CDB
 	DBA_HND(cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
 #endif
-#if DBA_CDB_BUILTIN
+#ifdef DBA_CDB_BUILTIN
 	DBA_NAMED_HND(cdb_make, cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
 #endif
-#if DBA_DB1
+#ifdef DBA_DB1
 	DBA_HND(db1, DBA_LOCK_ALL) /* No lock in lib */
 #endif
-#if DBA_DB2
+#ifdef DBA_DB2
 	DBA_HND(db2, DBA_LOCK_ALL) /* No lock in lib */
 #endif
-#if DBA_DB3
+#ifdef DBA_DB3
 	DBA_HND(db3, DBA_LOCK_ALL) /* No lock in lib */
 #endif
-#if DBA_DB4
+#ifdef DBA_DB4
 	DBA_HND(db4, DBA_LOCK_ALL) /* No lock in lib */
 #endif
-#if DBA_INIFILE
+#ifdef DBA_INIFILE
 	DBA_HND(inifile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_CAST_AS_FD) /* No lock in lib */
 #endif
-#if DBA_FLATFILE
+#ifdef DBA_FLATFILE
 	DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_NO_APPEND) /* No lock in lib */
 #endif
-#if DBA_QDBM
+#ifdef DBA_QDBM
 	DBA_HND(qdbm, DBA_LOCK_EXT)
 #endif
-#if DBA_TCADB
+#ifdef DBA_TCADB
 	DBA_HND(tcadb, DBA_LOCK_ALL)
 #endif
-#if DBA_LMDB
+#ifdef DBA_LMDB
 	DBA_HND(lmdb, DBA_LOCK_EXT)
 #endif
 	{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 };
 
-#if DBA_FLATFILE
+#ifdef DBA_FLATFILE
 #define DBA_DEFAULT "flatfile"
-#elif DBA_DB4
+#elif defined(DBA_DB4)
 #define DBA_DEFAULT "db4"
-#elif DBA_DB3
+#elif defined(DBA_DB3)
 #define DBA_DEFAULT "db3"
-#elif DBA_DB2
+#elif defined(DBA_DB2)
 #define DBA_DEFAULT "db2"
-#elif DBA_DB1
+#elif defined(DBA_DB1)
 #define DBA_DEFAULT "db1"
-#elif DBA_GDBM
+#elif defined(DBA_GDBM)
 #define DBA_DEFAULT "gdbm"
-#elif DBA_NBBM
+#elif defined(DBA_NBBM)
 #define DBA_DEFAULT "ndbm"
-#elif DBA_DBM
+#elif defined(DBA_DBM)
 #define DBA_DEFAULT "dbm"
-#elif DBA_QDBM
+#elif defined(DBA_QDBM)
 #define DBA_DEFAULT "qdbm"
-#elif DBA_TCADB
+#elif defined(DBA_TCADB)
 #define DBA_DEFAULT "tcadb"
-#elif DBA_LMDB
+#elif defined(DBA_LMDB)
 #define DBA_DEFAULT "lmdb"
 #else
 #define DBA_DEFAULT ""

ext/dba/dba_cdb.c

@@ -21,7 +21,7 @@
 
 #include "php.h"
 
-#if DBA_CDB
+#ifdef DBA_CDB
 #include "php_cdb.h"
 
 #include <sys/types.h>

ext/dba/dba_db1.c

@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#if DBA_DB1
+#ifdef DBA_DB1
 #include "php_db1.h"
 
 #ifdef DB1_INCLUDE_FILE

ext/dba/dba_db2.c

@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#if DBA_DB2
+#ifdef DBA_DB2
 #include "php_db2.h"
 #include <sys/stat.h>
 

ext/dba/dba_db3.c

@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#if DBA_DB3
+#ifdef DBA_DB3
 #include "php_db3.h"
 #include <sys/stat.h>
 

ext/dba/dba_db4.c

@@ -21,7 +21,7 @@
 
 #include "php.h"
 
-#if DBA_DB4
+#ifdef DBA_DB4
 #include "php_db4.h"
 #include <sys/stat.h>
 

ext/dba/dba_dbm.c

@@ -20,13 +20,13 @@
 
 #include "php.h"
 
-#if DBA_DBM
+#ifdef DBA_DBM
 #include "php_dbm.h"
 
 #ifdef DBM_INCLUDE_FILE
 #include DBM_INCLUDE_FILE
 #endif
-#if DBA_GDBM
+#ifdef DBA_GDBM
 #include "php_gdbm.h"
 #endif
 

ext/dba/dba_flatfile.c

@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#if DBA_FLATFILE
+#ifdef DBA_FLATFILE
 #include "php_flatfile.h"
 
 #include "libflatfile/flatfile.h"

ext/dba/dba_gdbm.c

@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#if DBA_GDBM
+#ifdef DBA_GDBM
 #include "php_gdbm.h"
 
 #ifdef GDBM_INCLUDE_FILE

ext/dba/dba_inifile.c

@@ -20,7 +20,7 @@
 
 #include "php.h"
 
-#if DBA_INIFILE
+#ifdef DBA_INIFILE
 #include "php_inifile.h"
 
 #include "libinifile/inifile.h"