Merge branch 'master' into MaidenBeast/translation_updates

[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 e7d67392ae01c4e6eeb53b569540694b36fa4e9c..f5633ab3f31dec7546438633407c4feb6edede7a 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -1,8 +1,7 @@
 #pragma flag enable subscope
 #pragma flag enable lo
 
-//float log(float x);
-#define log log_builtin \
-       #undef log \
-       /* turn the next use of "log" into a declaration of log_builtin */
-
+#ifndef NOCOMPAT
+# define WORKAROUND_XON010
+# define COMPAT_XON010_CHANNELS
+#endif