diff --git a/ext/dba/dba.c b/ext/dba/dba.c index b01d11e165f..842f85d73dc 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -21,7 +21,7 @@ #include "php.h" -#if HAVE_DBA +#ifdef HAVE_DBA #include "php_ini.h" #include @@ -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 "" diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c index 6b5013961f7..5af9121b565 100644 --- a/ext/dba/dba_cdb.c +++ b/ext/dba/dba_cdb.c @@ -21,7 +21,7 @@ #include "php.h" -#if DBA_CDB +#ifdef DBA_CDB #include "php_cdb.h" #include diff --git a/ext/dba/dba_db1.c b/ext/dba/dba_db1.c index 6f0f402b8d3..3a95cea460c 100644 --- a/ext/dba/dba_db1.c +++ b/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 diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c index 373464f80ec..8f6d47a9239 100644 --- a/ext/dba/dba_db2.c +++ b/ext/dba/dba_db2.c @@ -20,7 +20,7 @@ #include "php.h" -#if DBA_DB2 +#ifdef DBA_DB2 #include "php_db2.h" #include diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c index 8d25c7463ac..d9e948a623f 100644 --- a/ext/dba/dba_db3.c +++ b/ext/dba/dba_db3.c @@ -20,7 +20,7 @@ #include "php.h" -#if DBA_DB3 +#ifdef DBA_DB3 #include "php_db3.h" #include diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c index 3e9aaa13d43..3de66a42744 100644 --- a/ext/dba/dba_db4.c +++ b/ext/dba/dba_db4.c @@ -21,7 +21,7 @@ #include "php.h" -#if DBA_DB4 +#ifdef DBA_DB4 #include "php_db4.h" #include diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c index 316398e6ac7..afa645cb2fe 100644 --- a/ext/dba/dba_dbm.c +++ b/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 diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c index b631fe9352b..9d5b31128c0 100644 --- a/ext/dba/dba_flatfile.c +++ b/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" diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c index 1a47d1d708a..ec968f3f203 100644 --- a/ext/dba/dba_gdbm.c +++ b/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 diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c index dd0bc30f3d3..fe0adbccbfe 100644 --- a/ext/dba/dba_inifile.c +++ b/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" diff --git a/ext/dba/dba_lmdb.c b/ext/dba/dba_lmdb.c index b7c8151204d..e8fb99b5698 100644 --- a/ext/dba/dba_lmdb.c +++ b/ext/dba/dba_lmdb.c @@ -20,7 +20,7 @@ #include "php.h" -#if DBA_LMDB +#ifdef DBA_LMDB #include "php_lmdb.h" #ifdef LMDB_INCLUDE_FILE diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c index a97d3595a0c..d872add48e6 100644 --- a/ext/dba/dba_ndbm.c +++ b/ext/dba/dba_ndbm.c @@ -20,7 +20,7 @@ #include "php.h" -#if DBA_NDBM +#ifdef DBA_NDBM #include "php_ndbm.h" #include diff --git a/ext/dba/dba_qdbm.c b/ext/dba/dba_qdbm.c index 129b40915fa..d06af206599 100644 --- a/ext/dba/dba_qdbm.c +++ b/ext/dba/dba_qdbm.c @@ -20,7 +20,7 @@ #include "php.h" -#if DBA_QDBM +#ifdef DBA_QDBM #include "php_qdbm.h" #ifdef QDBM_INCLUDE_FILE diff --git a/ext/dba/dba_tcadb.c b/ext/dba/dba_tcadb.c index 4d0d65bf915..23c9e2d1d36 100644 --- a/ext/dba/dba_tcadb.c +++ b/ext/dba/dba_tcadb.c @@ -20,7 +20,7 @@ #include "php.h" -#if DBA_TCADB +#ifdef DBA_TCADB #include "php_tcadb.h" #ifdef TCADB_INCLUDE_FILE diff --git a/ext/dba/php_cdb.h b/ext/dba/php_cdb.h index a046f0796b3..9e6ebff9c6b 100644 --- a/ext/dba/php_cdb.h +++ b/ext/dba/php_cdb.h @@ -1,7 +1,7 @@ #ifndef PHP_CDB_H #define PHP_CDB_H -#if DBA_CDB +#ifdef DBA_CDB #include "php_dba.h" diff --git a/ext/dba/php_db1.h b/ext/dba/php_db1.h index c0bb5f08b4b..f8a97e6b83a 100644 --- a/ext/dba/php_db1.h +++ b/ext/dba/php_db1.h @@ -1,7 +1,7 @@ #ifndef PHP_DB1_H #define PHP_DB1_H -#if DBA_DB1 +#ifdef DBA_DB1 #include "php_dba.h" diff --git a/ext/dba/php_db2.h b/ext/dba/php_db2.h index 2a95223a854..b54dcdeec02 100644 --- a/ext/dba/php_db2.h +++ b/ext/dba/php_db2.h @@ -1,7 +1,7 @@ #ifndef PHP_DB2_H #define PHP_DB2_H -#if DBA_DB2 +#ifdef DBA_DB2 #include "php_dba.h" diff --git a/ext/dba/php_db3.h b/ext/dba/php_db3.h index 58bb0b62a08..f27380bbb1d 100644 --- a/ext/dba/php_db3.h +++ b/ext/dba/php_db3.h @@ -1,7 +1,7 @@ #ifndef PHP_DB3_H #define PHP_DB3_H -#if DBA_DB3 +#ifdef DBA_DB3 #include "php_dba.h" diff --git a/ext/dba/php_db4.h b/ext/dba/php_db4.h index fa814c3f5ec..1eb8067e820 100644 --- a/ext/dba/php_db4.h +++ b/ext/dba/php_db4.h @@ -1,7 +1,7 @@ #ifndef PHP_DB4_H #define PHP_DB4_H -#if DBA_DB4 +#ifdef DBA_DB4 #include "php_dba.h" diff --git a/ext/dba/php_dba.h b/ext/dba/php_dba.h index a2ad7fad604..28ca887222f 100644 --- a/ext/dba/php_dba.h +++ b/ext/dba/php_dba.h @@ -20,7 +20,7 @@ #include "php_version.h" #define PHP_DBA_VERSION PHP_VERSION -#if HAVE_DBA +#ifdef HAVE_DBA typedef enum { /* do not allow 0 here */ diff --git a/ext/dba/php_dbm.h b/ext/dba/php_dbm.h index 4c963d18ed9..d53c09fcb2b 100644 --- a/ext/dba/php_dbm.h +++ b/ext/dba/php_dbm.h @@ -1,7 +1,7 @@ #ifndef PHP_DBM_H #define PHP_DBM_H -#if DBA_DBM +#ifdef DBA_DBM #include "php_dba.h" diff --git a/ext/dba/php_flatfile.h b/ext/dba/php_flatfile.h index afa9f6d5d39..71c46a95eaa 100644 --- a/ext/dba/php_flatfile.h +++ b/ext/dba/php_flatfile.h @@ -1,7 +1,7 @@ #ifndef PHP_FLATFILE_H #define PHP_FLATFILE_H -#if DBA_FLATFILE +#ifdef DBA_FLATFILE #include "php_dba.h" diff --git a/ext/dba/php_gdbm.h b/ext/dba/php_gdbm.h index 3068404cfe2..0657c424a1a 100644 --- a/ext/dba/php_gdbm.h +++ b/ext/dba/php_gdbm.h @@ -1,7 +1,7 @@ #ifndef PHP_GDBM_H #define PHP_GDBM_H -#if DBA_GDBM +#ifdef DBA_GDBM #include "php_dba.h" diff --git a/ext/dba/php_inifile.h b/ext/dba/php_inifile.h index 69444df3c6d..eef58acfa67 100644 --- a/ext/dba/php_inifile.h +++ b/ext/dba/php_inifile.h @@ -1,7 +1,7 @@ #ifndef PHP_INIFILE_H #define PHP_INIFILE_H -#if DBA_INIFILE +#ifdef DBA_INIFILE #include "php_dba.h" diff --git a/ext/dba/php_lmdb.h b/ext/dba/php_lmdb.h index 1b4928f49bf..421f6a00949 100644 --- a/ext/dba/php_lmdb.h +++ b/ext/dba/php_lmdb.h @@ -1,7 +1,7 @@ #ifndef PHP_LMDB_H #define PHP_LMDB_H -#if DBA_LMDB +#ifdef DBA_LMDB #include "php_dba.h" diff --git a/ext/dba/php_ndbm.h b/ext/dba/php_ndbm.h index b1ebf15af32..68c04c680cf 100644 --- a/ext/dba/php_ndbm.h +++ b/ext/dba/php_ndbm.h @@ -1,7 +1,7 @@ #ifndef PHP_NDBM_H #define PHP_NDBM_H -#if DBA_NDBM +#ifdef DBA_NDBM #include "php_dba.h" diff --git a/ext/dba/php_qdbm.h b/ext/dba/php_qdbm.h index c88efcff4cf..bec4e8c50b3 100644 --- a/ext/dba/php_qdbm.h +++ b/ext/dba/php_qdbm.h @@ -1,7 +1,7 @@ #ifndef PHP_QDBM_H #define PHP_QDBM_H -#if DBA_QDBM +#ifdef DBA_QDBM #include "php_dba.h" diff --git a/ext/dba/php_tcadb.h b/ext/dba/php_tcadb.h index 8b145f3ea5c..6bfecf7d6d9 100644 --- a/ext/dba/php_tcadb.h +++ b/ext/dba/php_tcadb.h @@ -17,7 +17,7 @@ #ifndef PHP_TCADB_H #define PHP_TCADB_H -#if DBA_TCADB +#ifdef DBA_TCADB #include "php_dba.h"