From 8d68bcbd1327cd77aaa565c9512099e0cd02a58e Mon Sep 17 00:00:00 2001 From: Humza Shahid Date: Fri, 23 Jan 2026 13:37:13 +0000 Subject: [PATCH] remove duplicate '' include in ffi/glfw-export.c, and disambiguate mlton-generated export file for GLFW shell further (by prepending 'mlton-' to the file) --- build-unix-debug.sh | 2 +- build-unix.sh | 2 +- ffi/glfw-export.c | 1 - ffi/glfw-input.c | 2 +- ffi/{glfw-export.h => mlton-glfw-export.h} | 0 5 files changed, 3 insertions(+), 4 deletions(-) rename ffi/{glfw-export.h => mlton-glfw-export.h} (100%) diff --git a/build-unix-debug.sh b/build-unix-debug.sh index 1f4ddd0..396de3e 100755 --- a/build-unix-debug.sh +++ b/build-unix-debug.sh @@ -1,6 +1,6 @@ #!/bin/sh mlton -const 'Exn.keepHistory true' -link-opt "$(pkg-config --cflags glfw3) $(pkg-config --static --libs glfw3)" \ - -export-header ffi/glfw-export.h \ + -export-header ffi/mlton-glfw-export.h \ shf.mlb \ ffi/glad.c \ ffi/glfw-export.c \ diff --git a/build-unix.sh b/build-unix.sh index e6f153e..19dfdd1 100755 --- a/build-unix.sh +++ b/build-unix.sh @@ -1,6 +1,6 @@ #!/bin/sh mlton -link-opt "$(pkg-config --cflags glfw3) $(pkg-config --static --libs glfw3)" \ - -export-header ffi/glfw-export.h \ + -export-header ffi/mlton-glfw-export.h \ shf.mlb \ ffi/glad.c \ ffi/glfw-export.c \ diff --git a/ffi/glfw-export.c b/ffi/glfw-export.c index d1334f5..f87b84b 100644 --- a/ffi/glfw-export.c +++ b/ffi/glfw-export.c @@ -1,4 +1,3 @@ -#include #define GLFW_INCLUDE_NONE #include "glad.h" #include diff --git a/ffi/glfw-input.c b/ffi/glfw-input.c index 9f824ac..04c5dbb 100644 --- a/ffi/glfw-input.c +++ b/ffi/glfw-input.c @@ -1,4 +1,4 @@ -#include "glfw-export.h" +#include "mlton-glfw-export.h" #include "glad.h" #define GLFW_INCLUDE_NONE #include diff --git a/ffi/glfw-export.h b/ffi/mlton-glfw-export.h similarity index 100% rename from ffi/glfw-export.h rename to ffi/mlton-glfw-export.h