Solution 1: COPY_BUFFER_T without the EVERPARSE_ prefix

project-everest · Dec 5, 2023 · a8a70af · a8a70af
1 parent e639747
commit a8a70af
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/src/3d/EverParseEndianness.h b/src/3d/EverParseEndianness.h
@@ -35,7 +35,7 @@ extern "C" {
 
 typedef const char * EVERPARSE_STRING;
 typedef EVERPARSE_STRING PRIMS_STRING;
-typedef void* EVERPARSE_COPY_BUFFER_T;
+typedef void* COPY_BUFFER_T;
 
 #ifndef KRML_MAYBE_UNUSED_VAR
 #  define KRML_MAYBE_UNUSED_VAR(x) (void)(x)

diff --git a/src/3d/EverParseEndianness_Windows_NT.h b/src/3d/EverParseEndianness_Windows_NT.h
@@ -36,7 +36,7 @@ nswamy, protz, taramana 5-Feb-2020
 
 typedef const char * EVERPARSE_STRING;
 typedef EVERPARSE_STRING PRIMS_STRING;
-typedef void* EVERPARSE_COPY_BUFFER_T;
+typedef void* COPY_BUFFER_T;
 
 #ifndef KRML_MAYBE_UNUSED_VAR
 #  define KRML_MAYBE_UNUSED_VAR(x) (void)(x)

diff --git a/src/3d/ocaml/Batch.ml b/src/3d/ocaml/Batch.ml
@@ -354,6 +354,7 @@ let krml_args input_stream_binding emit_output_types_defs add_include skip_c_mak
       "-skip-compilation" ::
         "-static-header" :: "LowParse.Low.Base,EverParse3d.Prelude.StaticHeader,EverParse3d.ErrorCode,EverParse3d.CopyBuffer,EverParse3d.InputStream.\\*" ::
           "-no-prefix" :: "LowParse.Slice" ::
+          "-no-prefix" :: "EverParse3d.CopyBuffer" ::
             "-no-prefix" :: "LowParse.Low.BoundedInt" ::
                 "-library" :: everparse_only_bundle ::
                   "-warn-error" :: "-9@4-20" ::

diff --git a/src/3d/prelude/buffer/Makefile b/src/3d/prelude/buffer/Makefile
@@ -49,6 +49,7 @@ EverParse.h: EverParse.rsp
 	  -add-include 'EverParse:"EverParseEndianness.h"' \
 	  -static-header 'EverParse3d.Prelude.StaticHeader,LowParse.Low.Base,EverParse3d.ErrorCode,EverParse3d.InputStream.\*' \
 	  -no-prefix LowParse.Slice \
+	  -no-prefix EverParse3d.CopyBuffer \
 	  -no-prefix LowParse.Low.BoundedInt \
 	  -fmicrosoft \
 	  -fextern-c \

diff --git a/src/3d/prelude/extern/Makefile b/src/3d/prelude/extern/Makefile
@@ -54,6 +54,7 @@ KRML_EXTERN = $(KRML_HOME)/krml \
 	  -add-include 'EverParse:"EverParseEndianness.h"' \
 	  -static-header 'EverParse3d.Prelude.StaticHeader,LowParse.Low.Base,EverParse3d.ErrorCode,EverParse3d.InputStream.Extern.Type' \
 	  -no-prefix LowParse.Slice \
+	  -no-prefix EverParse3d.CopyBuffer \
 	  -no-prefix LowParse.Low.BoundedInt \
 	  -fmicrosoft \
 	  -fextern-c