Merge branch 'master' into terencehill/bot_ai

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

diff --git a/qcsrc/lib/macro.qh b/qcsrc/lib/macro.qh
index adcbe3553b03c9816868a1b0cdc2c40dfaf62c10..f2ec6df4a4206e8797f08ecb529fa0faa6adbcb3 100644 (file)
--- a/qcsrc/lib/macro.qh
+++ b/qcsrc/lib/macro.qh
@@ -1,8 +1,7 @@
-#ifndef MACRO_H
-#define MACRO_H
+#pragma once
 
 #if 1
-    void voidfunc() { error("voidfunc"); }
+    void voidfunc() { }
     #define MACRO_BEGIN if (1) {
     #define MACRO_END } else voidfunc()
 #else
@@ -10,4 +9,14 @@
     #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()