#74 fix issue with redefinition

dibyendumajumdar · Oct 23, 2021 · 2d1cc9b · 2d1cc9b
1 parent 74d2aed
commit 2d1cc9b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/ravi_api.h b/include/ravi_api.h
@@ -28,12 +28,15 @@
 
 #include <stdlib.h>
 
-typedef struct Ravi_MemoryAllocatorInterface {
+#ifndef C_MEMORYALLOCATOR_DEFINED
+#define C_MEMORYALLOCATOR_DEFINED
+typedef struct C_MemoryAllocator {
 	void *arena;
 	void *(*realloc)(void *arena, void* mem, size_t newsize);
 	void *(*calloc)(void *arena,  size_t n_elements, size_t elem_size);
 	void (*free)(void *arena, void *p);
-} Ravi_MemoryAllocatorInterface;
+} C_MemoryAllocator;
+#endif
 
 typedef struct Ravi_CompilerInterface {
 	/* ------------------------ Inputs ------------------------------ */
@@ -46,7 +49,7 @@ typedef struct Ravi_CompilerInterface {
 
 	char main_func_name[31]; /* Name of the generated function that when called will set up the Lua closure */
 
-	Ravi_MemoryAllocatorInterface *memory_allocator;
+	C_MemoryAllocator *memory_allocator;
 
 	/* ------------------------- Outputs ------------------------------ */
 	const char* generated_code;  /* Output of the compiler, must be freed by caller. */

diff --git a/src/chibicc/chibicc.h b/src/chibicc/chibicc.h
@@ -64,15 +64,17 @@ typedef struct C_Member C_Member;
 typedef struct C_Relocation C_Relocation;
 typedef struct C_Hideset C_Hideset;
 typedef struct C_Parser C_Parser;
-typedef struct C_MemoryAllocator C_MemoryAllocator;
 
+#ifndef C_MEMORYALLOCATOR_DEFINED
+#define C_MEMORYALLOCATOR_DEFINED
+typedef struct C_MemoryAllocator C_MemoryAllocator;
 struct C_MemoryAllocator {
   void *arena;
   void *(*realloc)(void *arena, void* mem, size_t newsize);
   void *(*calloc)(void *arena,  size_t n_elements, size_t elem_size);
   void (*free)(void *arena, void *p);
 };
-
+#endif
 
 //
 // strings.c