Trying to solve issues with windows preprocessor.

metacall · Oct 4, 2023 · fbbdd74 · fbbdd74
1 parent 0d0bd14
commit fbbdd74
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/source/plugin/include/plugin/plugin_interface.h b/source/plugin/include/plugin/plugin_interface.h
@@ -22,6 +22,7 @@
 #define PLUGIN_INTERFACE_H 1
 
 /* Private interface for using it inside any loader, extension or plugin for registering functions */
+/* TODO: Move this to source/metacall/include/metacall/private? */
 
 #include <preprocessor/preprocessor.h>
 

diff --git a/source/preprocessor/include/preprocessor/preprocessor_if.h b/source/preprocessor/include/preprocessor/preprocessor_if.h
@@ -50,8 +50,6 @@ extern "C" {
 #if defined(__EDG__) || defined(__EDG_VERSION__)
 	#define PREPROCESSOR_IF_IMPL(condition, true_expr, false_expr) PREPROCESSOR_IIF(PREPROCESSOR_BOOL(condition), true_expr, false_expr)
 	#define PREPROCESSOR_IF(condition, true_expr, false_expr)	   PREPROCESSOR_IF_IMPL(condition, true_expr, false_expr)
-#elif defined(_MSC_VER) && !defined(__clang__)
-	#define PREPROCESSOR_IF(condition, true_expr, false_expr) PREPROCESSOR_IIF(PREPROCESSOR_BOOL(condition), true_expr, false_expr)
 #else
 	#define PREPROCESSOR_IF(condition, true_expr, false_expr) PREPROCESSOR_IIF(PREPROCESSOR_BOOL(condition), (true_expr), (false_expr))
 #endif

diff --git a/source/preprocessor/include/preprocessor/preprocessor_stringify.h b/source/preprocessor/include/preprocessor/preprocessor_stringify.h
@@ -21,15 +21,7 @@ extern "C" {
 
 /* -- Macros -- */
 
-#if defined(_MSC_VER) && !defined(__clang__)
-	#define PREPROCESSOR_STRINGIFY_IMPL_II(...) #__VA_ARGS__
-	#define PREPROCESSOR_STRINGIFY_IMPL(...)                      \
-		PREPROCESSOR_IF(PREPROCESSOR_ARGS_NOT_EMPTY(__VA_ARGS__), \
-			PREPROCESSOR_STRINGIFY_IMPL_II(__VA_ARGS__),          \
-			"")
-#else
-	#define PREPROCESSOR_STRINGIFY_IMPL(expr) #expr
-#endif
+#define PREPROCESSOR_STRINGIFY_IMPL(...) #__VA_ARGS__
 
 #if defined(__MWERKS__)
 	#define PREPROCESSOR_STRINGIFY_IMPL_I(tuple) PREPROCESSOR_STRINGIFY_IMPL##tuple