Browse Source

COMP: Fix malloc/free declaration for windows compilers.

Brad King 19 years ago
parent
commit
8893db3539
2 changed files with 14 additions and 2 deletions
  1. 7 1
      Source/cmCommandArgumentParser.cxx
  2. 7 1
      Source/cmCommandArgumentParser.y

+ 7 - 1
Source/cmCommandArgumentParser.cxx

@@ -122,7 +122,6 @@ Run bison like this:
 
 Modify cmCommandArgumentParser.cxx:
   - remove TABs
-  - add __HP_aCC to the #if test for yyerrorlab warning suppression
 
 */
 
@@ -134,6 +133,13 @@ Modify cmCommandArgumentParser.cxx:
         cmCommandArgumentError(yyscanner, x)
 #define yyGetParser (cmCommandArgument_yyget_extra(yyscanner))
 
+/* Make sure the parser uses standard memory allocation.  The default
+   generated parser malloc/free declarations do not work on all
+   platforms.  */
+#include <stdlib.h>
+#define YYMALLOC malloc
+#define YYFREE free
+
 /*-------------------------------------------------------------------------*/
 #include "cmCommandArgumentParserHelper.h" /* Interface to parser object.  */
 #include "cmCommandArgumentLexer.h"  /* Interface to lexer object.  */

+ 7 - 1
Source/cmCommandArgumentParser.y

@@ -25,7 +25,6 @@ Run bison like this:
 
 Modify cmCommandArgumentParser.cxx:
   - remove TABs
-  - add __HP_aCC to the #if test for yyerrorlab warning suppression
 
 */
 
@@ -37,6 +36,13 @@ Modify cmCommandArgumentParser.cxx:
         cmCommandArgumentError(yyscanner, x)
 #define yyGetParser (cmCommandArgument_yyget_extra(yyscanner))
 
+/* Make sure the parser uses standard memory allocation.  The default
+   generated parser malloc/free declarations do not work on all
+   platforms.  */
+#include <stdlib.h>
+#define YYMALLOC malloc
+#define YYFREE free
+
 /*-------------------------------------------------------------------------*/
 #include "cmCommandArgumentParserHelper.h" /* Interface to parser object.  */
 #include "cmCommandArgumentLexer.h"  /* Interface to lexer object.  */