diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-02-20 22:25:42 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-02-20 22:25:42 +0300 |
| commit | 71d41ca6bb3a9d888b39f34a30f994ac1cf88873 (patch) | |
| tree | 3a11365b77b332c078440204fb82549d34237a35 /Zend/zend_ini_parser.h | |
| parent | 2d50280dd013556e51b6f275ca965fe7b530029b (diff) | |
| parent | 1ceec3a053647865493ab417d3ce401b9bc42450 (diff) | |
| download | php-71d41ca6bb3a9d888b39f34a30f994ac1cf88873.tar.gz | |
Merge branch 'master-5.6' of git://anonscm.debian.org/pkg-php/php
Conflicts:
debian/changelog
debian/patches/series
Diffstat (limited to 'Zend/zend_ini_parser.h')
| -rw-r--r-- | Zend/zend_ini_parser.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_ini_parser.h b/Zend/zend_ini_parser.h index 1e0c9a96d..ddfb49218 100644 --- a/Zend/zend_ini_parser.h +++ b/Zend/zend_ini_parser.h @@ -52,7 +52,8 @@ TC_QUOTED_STRING = 268, BOOL_TRUE = 269, BOOL_FALSE = 270, - END_OF_LINE = 271 + NULL_NULL = 271, + END_OF_LINE = 272 }; #endif /* Tokens. */ @@ -69,7 +70,8 @@ #define TC_QUOTED_STRING 268 #define BOOL_TRUE 269 #define BOOL_FALSE 270 -#define END_OF_LINE 271 +#define NULL_NULL 271 +#define END_OF_LINE 272 |