Skip to content

Commit 738adce

Browse files
GirgiasGirgias
committed
Fix [-Wundef] warnings in DBA extension
1 parent cd6c338 commit 738adce

28 files changed

+54
-54
lines changed

‎ext/dba/dba.c

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "php.h"
2323

24-
#if HAVE_DBA
24+
#ifdef HAVE_DBA
2525

2626
#include "php_ini.h"
2727
#include <stdio.h>
@@ -160,72 +160,72 @@ static zend_string* php_dba_make_key(HashTable *key)
160160
/* {{{ globals */
161161

162162
static dba_handler handler[] = {
163-
#if DBA_GDBM
163+
#ifdef DBA_GDBM
164164
DBA_HND(gdbm, DBA_LOCK_EXT) /* Locking done in library if set */
165165
#endif
166-
#if DBA_DBM
166+
#ifdef DBA_DBM
167167
DBA_HND(dbm, DBA_LOCK_ALL) /* No lock in lib */
168168
#endif
169-
#if DBA_NDBM
169+
#ifdef DBA_NDBM
170170
DBA_HND(ndbm, DBA_LOCK_ALL) /* Could be done in library: filemode = 0644 + S_ENFMT */
171171
#endif
172-
#if DBA_CDB
172+
#ifdef DBA_CDB
173173
DBA_HND(cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
174174
#endif
175-
#if DBA_CDB_BUILTIN
175+
#ifdef DBA_CDB_BUILTIN
176176
DBA_NAMED_HND(cdb_make, cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
177177
#endif
178-
#if DBA_DB1
178+
#ifdef DBA_DB1
179179
DBA_HND(db1, DBA_LOCK_ALL) /* No lock in lib */
180180
#endif
181-
#if DBA_DB2
181+
#ifdef DBA_DB2
182182
DBA_HND(db2, DBA_LOCK_ALL) /* No lock in lib */
183183
#endif
184-
#if DBA_DB3
184+
#ifdef DBA_DB3
185185
DBA_HND(db3, DBA_LOCK_ALL) /* No lock in lib */
186186
#endif
187-
#if DBA_DB4
187+
#ifdef DBA_DB4
188188
DBA_HND(db4, DBA_LOCK_ALL) /* No lock in lib */
189189
#endif
190-
#if DBA_INIFILE
190+
#ifdef DBA_INIFILE
191191
DBA_HND(inifile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_CAST_AS_FD) /* No lock in lib */
192192
#endif
193-
#if DBA_FLATFILE
193+
#ifdef DBA_FLATFILE
194194
DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_NO_APPEND) /* No lock in lib */
195195
#endif
196-
#if DBA_QDBM
196+
#ifdef DBA_QDBM
197197
DBA_HND(qdbm, DBA_LOCK_EXT)
198198
#endif
199-
#if DBA_TCADB
199+
#ifdef DBA_TCADB
200200
DBA_HND(tcadb, DBA_LOCK_ALL)
201201
#endif
202-
#if DBA_LMDB
202+
#ifdef DBA_LMDB
203203
DBA_HND(lmdb, DBA_LOCK_EXT)
204204
#endif
205205
{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
206206
};
207207

208-
#if DBA_FLATFILE
208+
#ifdef DBA_FLATFILE
209209
#define DBA_DEFAULT "flatfile"
210-
#elif DBA_DB4
210+
#elif defined(DBA_DB4)
211211
#define DBA_DEFAULT "db4"
212-
#elif DBA_DB3
212+
#elif defined(DBA_DB3)
213213
#define DBA_DEFAULT "db3"
214-
#elif DBA_DB2
214+
#elif defined(DBA_DB2)
215215
#define DBA_DEFAULT "db2"
216-
#elif DBA_DB1
216+
#elif defined(DBA_DB1)
217217
#define DBA_DEFAULT "db1"
218-
#elif DBA_GDBM
218+
#elif defined(DBA_GDBM)
219219
#define DBA_DEFAULT "gdbm"
220-
#elif DBA_NBBM
220+
#elif defined(DBA_NBBM)
221221
#define DBA_DEFAULT "ndbm"
222-
#elif DBA_DBM
222+
#elif defined(DBA_DBM)
223223
#define DBA_DEFAULT "dbm"
224-
#elif DBA_QDBM
224+
#elif defined(DBA_QDBM)
225225
#define DBA_DEFAULT "qdbm"
226-
#elif DBA_TCADB
226+
#elif defined(DBA_TCADB)
227227
#define DBA_DEFAULT "tcadb"
228-
#elif DBA_LMDB
228+
#elif defined(DBA_LMDB)
229229
#define DBA_DEFAULT "lmdb"
230230
#else
231231
#define DBA_DEFAULT ""

‎ext/dba/dba_cdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "php.h"
2323

24-
#if DBA_CDB
24+
#ifdef DBA_CDB
2525
#include "php_cdb.h"
2626

2727
#include <sys/types.h>

‎ext/dba/dba_db1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_DB1
23+
#ifdef DBA_DB1
2424
#include "php_db1.h"
2525

2626
#ifdef DB1_INCLUDE_FILE

‎ext/dba/dba_db2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_DB2
23+
#ifdef DBA_DB2
2424
#include "php_db2.h"
2525
#include <sys/stat.h>
2626

‎ext/dba/dba_db3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_DB3
23+
#ifdef DBA_DB3
2424
#include "php_db3.h"
2525
#include <sys/stat.h>
2626

‎ext/dba/dba_db4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "php.h"
2323

24-
#if DBA_DB4
24+
#ifdef DBA_DB4
2525
#include "php_db4.h"
2626
#include <sys/stat.h>
2727

‎ext/dba/dba_dbm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_DBM
23+
#ifdef DBA_DBM
2424
#include "php_dbm.h"
2525

2626
#ifdef DBM_INCLUDE_FILE
2727
#include DBM_INCLUDE_FILE
2828
#endif
29-
#if DBA_GDBM
29+
#ifdef DBA_GDBM
3030
#include "php_gdbm.h"
3131
#endif
3232

‎ext/dba/dba_flatfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_FLATFILE
23+
#ifdef DBA_FLATFILE
2424
#include "php_flatfile.h"
2525

2626
#include "libflatfile/flatfile.h"

‎ext/dba/dba_gdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_GDBM
23+
#ifdef DBA_GDBM
2424
#include "php_gdbm.h"
2525

2626
#ifdef GDBM_INCLUDE_FILE

‎ext/dba/dba_inifile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_INIFILE
23+
#ifdef DBA_INIFILE
2424
#include "php_inifile.h"
2525

2626
#include "libinifile/inifile.h"

‎ext/dba/dba_lmdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_LMDB
23+
#ifdef DBA_LMDB
2424
#include "php_lmdb.h"
2525

2626
#ifdef LMDB_INCLUDE_FILE

‎ext/dba/dba_ndbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_NDBM
23+
#ifdef DBA_NDBM
2424
#include "php_ndbm.h"
2525

2626
#include <fcntl.h>

‎ext/dba/dba_qdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_QDBM
23+
#ifdef DBA_QDBM
2424
#include "php_qdbm.h"
2525

2626
#ifdef QDBM_INCLUDE_FILE

‎ext/dba/dba_tcadb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "php.h"
2222

23-
#if DBA_TCADB
23+
#ifdef DBA_TCADB
2424
#include "php_tcadb.h"
2525

2626
#ifdef TCADB_INCLUDE_FILE

‎ext/dba/php_cdb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_CDB_H
22
#define PHP_CDB_H
33

4-
#if DBA_CDB
4+
#ifdef DBA_CDB
55

66
#include "php_dba.h"
77

‎ext/dba/php_db1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_DB1_H
22
#define PHP_DB1_H
33

4-
#if DBA_DB1
4+
#ifdef DBA_DB1
55

66
#include "php_dba.h"
77

‎ext/dba/php_db2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_DB2_H
22
#define PHP_DB2_H
33

4-
#if DBA_DB2
4+
#ifdef DBA_DB2
55

66
#include "php_dba.h"
77

‎ext/dba/php_db3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_DB3_H
22
#define PHP_DB3_H
33

4-
#if DBA_DB3
4+
#ifdef DBA_DB3
55

66
#include "php_dba.h"
77

‎ext/dba/php_db4.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_DB4_H
22
#define PHP_DB4_H
33

4-
#if DBA_DB4
4+
#ifdef DBA_DB4
55

66
#include "php_dba.h"
77

‎ext/dba/php_dba.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "php_version.h"
2121
#define PHP_DBA_VERSION PHP_VERSION
2222

23-
#if HAVE_DBA
23+
#ifdef HAVE_DBA
2424

2525
typedef enum {
2626
/* do not allow 0 here */

‎ext/dba/php_dbm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_DBM_H
22
#define PHP_DBM_H
33

4-
#if DBA_DBM
4+
#ifdef DBA_DBM
55

66
#include "php_dba.h"
77

‎ext/dba/php_flatfile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_FLATFILE_H
22
#define PHP_FLATFILE_H
33

4-
#if DBA_FLATFILE
4+
#ifdef DBA_FLATFILE
55

66
#include "php_dba.h"
77

‎ext/dba/php_gdbm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_GDBM_H
22
#define PHP_GDBM_H
33

4-
#if DBA_GDBM
4+
#ifdef DBA_GDBM
55

66
#include "php_dba.h"
77

‎ext/dba/php_inifile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_INIFILE_H
22
#define PHP_INIFILE_H
33

4-
#if DBA_INIFILE
4+
#ifdef DBA_INIFILE
55

66
#include "php_dba.h"
77

‎ext/dba/php_lmdb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_LMDB_H
22
#define PHP_LMDB_H
33

4-
#if DBA_LMDB
4+
#ifdef DBA_LMDB
55

66
#include "php_dba.h"
77

‎ext/dba/php_ndbm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_NDBM_H
22
#define PHP_NDBM_H
33

4-
#if DBA_NDBM
4+
#ifdef DBA_NDBM
55

66
#include "php_dba.h"
77

‎ext/dba/php_qdbm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_QDBM_H
22
#define PHP_QDBM_H
33

4-
#if DBA_QDBM
4+
#ifdef DBA_QDBM
55

66
#include "php_dba.h"
77

‎ext/dba/php_tcadb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef PHP_TCADB_H
1818
#define PHP_TCADB_H
1919

20-
#if DBA_TCADB
20+
#ifdef DBA_TCADB
2121

2222
#include "php_dba.h"
2323

0 commit comments

Comments
 (0)