diff options
author | Felipe Pena <felipensp@gmail.com> | 2012-04-30 15:56:15 -0300 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2012-04-30 15:56:15 -0300 |
commit | 45ef3c759e80b4eda2e24b2f497be58268989b5f (patch) | |
tree | d4cd9302304fdc350a65ec98b416c2384f0007c8 | |
parent | 3e7af0f25ab4cde49b539f2e99f29fba2a95149d (diff) | |
parent | 79961dccab18c34befa5b4bc4f6170ea2988e30e (diff) | |
download | php-git-45ef3c759e80b4eda2e24b2f497be58268989b5f.tar.gz |
Merge branch 'PHP-5.4'
* PHP-5.4:
- Fixed Windows build
-rw-r--r-- | Zend/zend_language_scanner.l | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 9ea4b86bbb..c73f39aedb 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -30,11 +30,12 @@ #endif #include "zend_language_scanner_defs.h" + +#include <errno.h> +#include "zend.h" #ifdef PHP_WIN32 # include <Winuser.h> #endif -#include <errno.h> -#include "zend.h" #include "zend_alloc.h" #include <zend_language_parser.h> #include "zend_compile.h" |