X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Fmisc.qh;h=474484c64e5f85aa279835a1826983c1eb0b080f;hp=6c29a4b88dd100f74ded51a0fe91ad82179c7d25;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hpb=05776c4204bf73c8ebc84e615ad088af45ebe5ed

diff --git a/qcsrc/lib/misc.qh b/qcsrc/lib/misc.qh
index 6c29a4b88..474484c64 100644
--- a/qcsrc/lib/misc.qh
+++ b/qcsrc/lib/misc.qh
@@ -10,13 +10,15 @@
 
 	#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 */
+	/** for use within macros */
 	#define OVERLOAD_(F, ...) P99_IF_EMPTY(__VA_ARGS__)(P99_PASTE2(F, _00)())(P99_PASTE3(F, _, P00_NARG(__VA_ARGS__))(__VA_ARGS__))
+	#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__)
+	#define OVERLOAD_(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
+	#define OVERLOAD__(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
 #endif
 
 #if defined(CSQC)
@@ -37,9 +39,8 @@
 // With block may not contain continue or break
 #define WITH(type, name, value, block) \
 	MACRO_BEGIN \
-	{ \
 		type __with_save = (name); \
 		name = (value); \
 		LAMBDA(block) \
 		name = __with_save; \
-	} MACRO_END
+	MACRO_END