Skip to content

Commit 1e4cf4f

Browse files
GirgiasGirgias
committed
DBA W.I.P.
1 parent ff38a1b commit 1e4cf4f

15 files changed

+40
-40
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>
@@ -223,72 +223,72 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free)
223223
/* {{{ globals */
224224

225225
static dba_handler handler[] = {
226-
#if DBA_GDBM
226+
#ifdef DBA_GDBM
227227
DBA_HND(gdbm, DBA_LOCK_EXT) /* Locking done in library if set */
228228
#endif
229-
#if DBA_DBM
229+
#ifdef DBA_DBM
230230
DBA_HND(dbm, DBA_LOCK_ALL) /* No lock in lib */
231231
#endif
232-
#if DBA_NDBM
232+
#ifdef DBA_NDBM
233233
DBA_HND(ndbm, DBA_LOCK_ALL) /* Could be done in library: filemode = 0644 + S_ENFMT */
234234
#endif
235-
#if DBA_CDB
235+
#ifdef DBA_CDB
236236
DBA_HND(cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
237237
#endif
238-
#if DBA_CDB_BUILTIN
238+
#ifdef DBA_CDB_BUILTIN
239239
DBA_NAMED_HND(cdb_make, cdb, DBA_STREAM_OPEN|DBA_LOCK_ALL) /* No lock in lib */
240240
#endif
241-
#if DBA_DB1
241+
#ifdef DBA_DB1
242242
DBA_HND(db1, DBA_LOCK_ALL) /* No lock in lib */
243243
#endif
244-
#if DBA_DB2
244+
#ifdef DBA_DB2
245245
DBA_HND(db2, DBA_LOCK_ALL) /* No lock in lib */
246246
#endif
247-
#if DBA_DB3
247+
#ifdef DBA_DB3
248248
DBA_HND(db3, DBA_LOCK_ALL) /* No lock in lib */
249249
#endif
250-
#if DBA_DB4
250+
#ifdef DBA_DB4
251251
DBA_HND(db4, DBA_LOCK_ALL) /* No lock in lib */
252252
#endif
253-
#if DBA_INIFILE
253+
#ifdef DBA_INIFILE
254254
DBA_HND(inifile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_CAST_AS_FD) /* No lock in lib */
255255
#endif
256-
#if DBA_FLATFILE
256+
#ifdef DBA_FLATFILE
257257
DBA_HND(flatfile, DBA_STREAM_OPEN|DBA_LOCK_ALL|DBA_NO_APPEND) /* No lock in lib */
258258
#endif
259-
#if DBA_QDBM
259+
#ifdef DBA_QDBM
260260
DBA_HND(qdbm, DBA_LOCK_EXT)
261261
#endif
262-
#if DBA_TCADB
262+
#ifdef DBA_TCADB
263263
DBA_HND(tcadb, DBA_LOCK_ALL)
264264
#endif
265-
#if DBA_LMDB
265+
#ifdef DBA_LMDB
266266
DBA_HND(lmdb, DBA_LOCK_EXT)
267267
#endif
268268
{ NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
269269
};
270270

271-
#if DBA_FLATFILE
271+
#ifdef DBA_FLATFILE
272272
#define DBA_DEFAULT "flatfile"
273-
#elif DBA_DB4
273+
#elif defined(DBA_DB4)
274274
#define DBA_DEFAULT "db4"
275-
#elif DBA_DB3
275+
#elif defined(DBA_DB3)
276276
#define DBA_DEFAULT "db3"
277-
#elif DBA_DB2
277+
#elif defined(DBA_DB2)
278278
#define DBA_DEFAULT "db2"
279-
#elif DBA_DB1
279+
#elif defined(DBA_DB1)
280280
#define DBA_DEFAULT "db1"
281-
#elif DBA_GDBM
281+
#elif defined(DBA_GDBM)
282282
#define DBA_DEFAULT "gdbm"
283-
#elif DBA_NBBM
283+
#elif defined(DBA_NBBM)
284284
#define DBA_DEFAULT "ndbm"
285-
#elif DBA_DBM
285+
#elif defined(DBA_DBM)
286286
#define DBA_DEFAULT "dbm"
287-
#elif DBA_QDBM
287+
#elif defined(DBA_QDBM)
288288
#define DBA_DEFAULT "qdbm"
289-
#elif DBA_TCADB
289+
#elif defined(DBA_TCADB)
290290
#define DBA_DEFAULT "tcadb"
291-
#elif DBA_LMDB
291+
#elif defined(DBA_LMDB)
292292
#define DBA_DEFAULT "lmdb"
293293
#else
294294
#define DBA_DEFAULT ""

‎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)