Merge remote branch 'origin/master' into samual/add_eventlog_reporting

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / util-pre.qh

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index 2472374df33dc485ba5373a107aad432972d6f49..e61d57fb65e8721660aa369acb81628e20f9abd9 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -1,5 +1,7 @@
-//float log(float x);
-#define log log_builtin \
-       #undef log \
-       /* turn the next use of "log" into a declaration of log_builtin */
+#pragma flag enable subscope
+#pragma flag enable lo
 
+#ifndef NOCOMPAT
+//# define WORKAROUND_XON010
+//# define COMPAT_XON010_CHANNELS
+#endif