peg: cast to (void *) in PCC_FREE

This may be cause an error when compiling generated .c files with mvc. Signed-off-by: Masatake YAMATO <[email protected]>
paulschuberth · Apr 8, 2021 · f34fe2f · f34fe2f
1 parent ae30dd4
commit f34fe2f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/peg/kotlin_pre.h b/peg/kotlin_pre.h
@@ -15,16 +15,14 @@
 #include "numarray.h"
 #include "kind.h"
 #include "read.h"
+#include "peg_common.h"
 
 
 /*
 *   MACROS
 */
+#undef PCC_GETCHAR
 #define PCC_GETCHAR(auxil) getcFromKotlinFile(auxil)
-#define PCC_MALLOC(auxil,size) eMalloc(size)
-#define PCC_REALLOC(auxil,ptr,size) eRealloc(ptr,size)
-#define PCC_FREE(auxil,ptr) eFreeNoNullCheck(ptr)
-#define PCC_ERROR(auxil) reportError(auxil)
 
 /*
 *   DATA DECLARATIONS

diff --git a/peg/peg_common.h b/peg/peg_common.h
@@ -0,0 +1,19 @@
+/*
+ *   Copyright (c) 2021 Masatake YAMATO
+ *
+ *   This source code is released for free distribution under the terms of the
+ *   GNU General Public License version 2 or (at your option) any later version.
+ *
+ *   This module contains macros, data decls and prototypes to generate tags for Kotlin.
+ */
+
+#ifndef CTAGS_PEG_COMMON
+#define CTAGS_PEG_COMMON
+
+#define PCC_GETCHAR(auxil) getcFromInputFile()
+#define PCC_MALLCO(auxil,size) eMalloc(size)
+#define PCC_REALLOC(auxil,ptr,size) eRealloc(ptr,size)
+#define PCC_FREE(auxil,ptr) eFreeNoNullCheck((void *)ptr)
+#define PCC_ERROR(auxil) reportError(auxil)
+
+#endif	/* !CTAGS_PEG_COMMON */
diff --git a/peg/varlink_pre.h b/peg/varlink_pre.h
@@ -20,16 +20,12 @@
 #include "numarray.h"
 #include "kind.h"
 #include "read.h"
+#include "peg_common.h"
 
 
 /*
 *   MACROS
 */
-#define PCC_GETCHAR(auxil) getcFromInputFile()
-#define PCC_MALLCO(auxil,size) eMalloc(size)
-#define PCC_REALLOC(auxil,ptr,size) eRealloc(ptr,size)
-#define PCC_FREE(auxil,ptr) eFreeNoNullCheck(ptr)
-#define PCC_ERROR(auxil) reportError(auxil)
 
 /*
 *   DATA DECLARATIONS

diff --git a/source.mak b/source.mak
@@ -161,7 +161,7 @@ OPTLIB2C_SRCS = $(OPTLIB2C_INPUT:.ctags=.c)
 include makefiles/peg_input.mak
 PEG_SRCS = $(PEG_INPUT:.peg=.c)
 PEG_HEADS = $(PEG_INPUT:.peg=.h)
-PEG_EXTRA_HEADS = $(PEG_INPUT:.peg=_pre.h) $(PEG_INPUT:.peg=_post.h)
+PEG_EXTRA_HEADS = peg/peg_common.h $(PEG_INPUT:.peg=_pre.h) $(PEG_INPUT:.peg=_post.h)
 PEG_OBJS = $(PEG_SRCS:.c=.$(OBJEXT))
 
 PARSER_HEADS = \