Cleanups.

sfw/core/file_access.cpp

@@ -29,7 +29,9 @@
 #define S_ISREG(m) ((m)&_S_IFREG)
 #endif
 
+//--STRIP
 #include "core/sfw_time.h"
+//--STRIP
 
 #else
 

tools/merger/sfw_3rd_full.x.inl

@@ -9,7 +9,6 @@
 #ifndef ONLY_GLAD
 
 #ifdef __APPLE__
-
 #ifndef _APPLE_NO_IMPL_
 
 #ifndef SFW_3RD_IMPL
@@ -17,7 +16,6 @@
 #endif //SFW_3RD_IMPL
 
 #endif //_APPLE_NO_IMPL_
-
 #endif //__APPLE__
 
 #ifdef SFW_3RD_IMPL
@@ -71,5 +69,5 @@
 #undef timeGetTime
 #undef Time
 
-#endif
+#endif //ONLY_GLAD
 

tools/merger/sfw_core.h.inl

@@ -6,7 +6,9 @@
 {{FILEINLINE:tools/merger/sfw_readme.inl.h}}
 {{FILEINLINE:tools/merger/sfw_linceses_core.inl.h}}
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 
 #include <float.h>
 #include <math.h>

tools/merger/sfw_full.cpp.inl

@@ -21,16 +21,17 @@
 #ifdef __APPLE__
 #ifndef _APPLE_NO_IMPL_
 #define _APPLE_NO_IMPL_
-#endif
-#endif
+#endif //_APPLE_NO_IMPL_
+#endif //__APPLE__
 
 #include "sfw.h"
 
+#ifdef __APPLE__
 #undef ONLY_GLAD
-
 #include "sfw_3rd.m"
+#endif //__APPLE__
 
-#endif
+#endif //SFW_H
 
 // On OSX sfw_3rd.m has to be compiled manually on Objective C Mode.
 #ifndef __APPLE__
@@ -43,6 +44,7 @@
 #define Font The_Font_I_dont_care
 #endif
 
+#undef ONLY_GLAD
 #include "sfw_3rd.m"
 
 #undef CursorShape
@@ -205,7 +207,7 @@
 #undef GAMEPAD_NAME
 #endif
 
-#endif
+#endif //SFW_3RD_IMPL
 
 #endif // #ifndef __APPLE__
 

tools/merger/sfw_full.h.inl

@@ -7,7 +7,9 @@
 {{FILEINLINE:tools/merger/sfw_linceses_core.inl.h}}
 {{FILEINLINE:tools/merger/sfw_linceses_render_core.inl.h}}
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 
 #include <float.h>
 #include <math.h>

tools/merger/sfwl/sfwl_core.h.inl

@@ -4,7 +4,9 @@
 {{FILEINLINE:tools/merger/sfw_readme.inl.h}}
 {{FILEINLINE:tools/merger/sfw_linceses_core.inl.h}}
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 
 #include <float.h>
 #include <math.h>

tools/merger/sfwl/sfwl_full.h.inl

@@ -4,7 +4,9 @@
 {{FILEINLINE:tools/merger/sfw_readme.inl.h}}
 {{FILEINLINE:tools/merger/sfw_linceses_core.inl.h}}
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 
 #include <float.h>
 #include <math.h>