diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/dba/php_dba.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/dba/php_dba.h')
| -rw-r--r-- | ext/dba/php_dba.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/dba/php_dba.h b/ext/dba/php_dba.h index 3421b5de93..6fc0357136 100644 --- a/ext/dba/php_dba.h +++ b/ext/dba/php_dba.h @@ -23,7 +23,7 @@ #if HAVE_DBA -typedef enum { +typedef enum { /* do not allow 0 here */ DBA_READER = 1, DBA_WRITER, @@ -49,7 +49,7 @@ typedef struct dba_info { zval *argv; /* private */ int flags; /* whether and how dba did locking and other flags*/ - struct dba_handler *hnd; + struct dba_handler *hnd; dba_lock lock; } dba_info; @@ -127,7 +127,7 @@ typedef struct dba_handler { DBA_INFO_FUNC(x) #define VALLEN(p) Z_STRVAL_PP(p), Z_STRLEN_PP(p) - + PHP_FUNCTION(dba_open); PHP_FUNCTION(dba_popen); PHP_FUNCTION(dba_close); |