X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Flib%2Fmisc.qh;h=6c29a4b88dd100f74ded51a0fe91ad82179c7d25;hb=678127044857fb9b89f06faf7a3313bdeb43205c;hp=cecb15a11eb647a0662412970805d2625d87f0a9;hpb=f1a87492d9fed27a64d0e99c068705aba5509f26;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/misc.qh b/qcsrc/lib/misc.qh
index cecb15a11..6c29a4b88 100644
--- a/qcsrc/lib/misc.qh
+++ b/qcsrc/lib/misc.qh
@@ -1,15 +1,6 @@
-#ifndef MISC_H
-#define MISC_H
-
-#ifdef GMQCC
-	#define EVAL(...) __VA_ARGS__
-
-	#define OVERLOAD_(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
-	#define OVERLOAD(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
-#else
-	#define EMPTY()
-	#define DEFER(id) id EMPTY()
+#pragma once
 
+#ifdef __STDC__
 	#define EVAL(...) EVAL1(EVAL1(EVAL1(__VA_ARGS__)))
 	#define EVAL1(...) EVAL2(EVAL2(EVAL2(__VA_ARGS__)))
 	#define EVAL2(...) EVAL3(EVAL3(EVAL3(__VA_ARGS__)))
@@ -17,10 +8,15 @@
 	#define EVAL4(...) EVAL5(EVAL5(EVAL5(__VA_ARGS__)))
 	#define EVAL5(...) __VA_ARGS__
 
-	#define OVERLOAD___(F, _16, _15, _14, _13, _12, _11, _10, _9, _8, _7, _6, _5, _4, _3, _2, _1, n, ...) F##_##n
-	#define OVERLOAD__(F, ...) OVERLOAD___(F,##__VA_ARGS__, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
-	#define OVERLOAD_(...) DEFER(OVERLOAD__(__VA_ARGS__))
-	#define OVERLOAD(F, ...) OVERLOAD_(F,##__VA_ARGS__)(__VA_ARGS__)
+	#include "p99.qh"
+	#define OVERLOAD(F, ...) P99_IF_EMPTY(__VA_ARGS__)(P99_PASTE2(F, _00)())(P99_PASTE3(F, _, P00_NARG(__VA_ARGS__))(__VA_ARGS__))
+	/** for use within a macro */
+	#define OVERLOAD_(F, ...) P99_IF_EMPTY(__VA_ARGS__)(P99_PASTE2(F, _00)())(P99_PASTE3(F, _, P00_NARG(__VA_ARGS__))(__VA_ARGS__))
+#else
+	#define EVAL(...) __VA_ARGS__
+
+	#define OVERLOAD_(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
+	#define OVERLOAD(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
 #endif
 
 #if defined(CSQC)
@@ -47,5 +43,3 @@
 		LAMBDA(block) \
 		name = __with_save; \
 	} MACRO_END
-
-#endif