com php-src: fix "inconsistent dll linkage" warning caused by bison: Zend/zend_ini_parser.y Zend/zend_language_parser. y

From: Date: Wed, 29 Oct 2014 14:30:00 +0000
Subject: com php-src: fix "inconsistent dll linkage" warning caused by bison: Zend/zend_ini_parser.y Zend/zend_language_parser. y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82863@lists.php.net to get a copy of this message
Commit: cf581178e7123a3e5328cd0ed8d9f2e19fee38c1 Author: Anatol Belski <ab@php.net> Tue, 28 Oct 2014 19:18:47 +0100 Parents: d9d16d2e68c897fe02848e96623aaa73d170fb39 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cf581178e7123a3e5328cd0ed8d9f2e19fee38c1 Log: fix "inconsistent dll linkage" warning caused by bison stdlib.h might not be always using _STDLIB_H, that will move bison to redeclare the malloc/free prototypes. Changed paths: M Zend/zend_ini_parser.y M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 90e0fdc..d049884 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -43,6 +43,11 @@ int ini_parse(void); #define ZEND_INI_PARSER_CB (CG(ini_parser_param))->ini_parser_cb #define ZEND_INI_PARSER_ARG (CG(ini_parser_param))->arg +#ifdef _MSC_VER +#define YYMALLOC malloc +#define YYFREE free +#endif + /* {{{ zend_ini_do_op() */ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index d25e1d2..8828620 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -43,6 +43,11 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); #define YYERROR_VERBOSE #define YYSTYPE zend_parser_stack_elem +#ifdef _MSC_VER +#define YYMALLOC malloc +#define YYFREE free +#endif + %} %pure_parser

« previous php.cvs (#82863) next »