Merge branch 'terencehill/cl_forceplayercolors_3' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / macro.qh

diff --git a/qcsrc/lib/macro.qh b/qcsrc/lib/macro.qh
index adcbe3553b03c9816868a1b0cdc2c40dfaf62c10..62c1e3133c67a96f2a43bf853d97fdacca74f5b6 100644 (file)
--- a/qcsrc/lib/macro.qh
+++ b/qcsrc/lib/macro.qh
@@ -1,13 +1,23 @@
-#ifndef MACRO_H
-#define MACRO_H
+#pragma once
 
+// NOTE: spaces removed from these often used macros to reduce size when expanded
 #if 1
-    void voidfunc() { error("voidfunc"); }
-    #define MACRO_BEGIN if (1) {
-    #define MACRO_END } else voidfunc()
+    void voidfunc() { }
+    #define MACRO_BEGIN if(1){
+    #define MACRO_END }else voidfunc()
 #else
-    #define MACRO_BEGIN do {
-    #define MACRO_END } while (0)
+    #define MACRO_BEGIN do{
+    #define MACRO_END }while(0)
 #endif
 
-#endif
+/** Marker for use in (RVALUE, (expr)) */
+#define RVALUE 0
+
+#define _CAT(a, b) a ## b
+#define CAT(a, b) _CAT(a, b)
+
+#define _STR(it) #it
+#define STR(it) _STR(it)
+
+#define EMPTY()
+#define DEFER(id) id EMPTY()