aboutsummaryrefslogtreecommitdiff
path: root/layers/multi.cpp
diff options
context:
space:
mode:
authorIan Elliott <ian@lunarg.com>2015-02-12 17:08:34 -0700
committerIan Elliott <ian@lunarg.com>2015-02-12 17:52:56 -0700
commit320a832c98552a6e5b35438fe31cfd856f1e5379 (patch)
treebb1da7a336ec98c5aaf5282dfb743ad281e5c74e /layers/multi.cpp
parent48471968352104402c433a8f2b7a03b743de6abd (diff)
downloadusermoji-320a832c98552a6e5b35438fe31cfd856f1e5379.tar.xz
Win: Attempt to keep from using Linux functions.
This is a hopefully-temporary solution to prevent some of the problems of people breaking the Windows build while developing on Linux (or vice-versa). This uses macros of the names of Linux/Windows-specific functions in order to catch people who use those functions directly, instead of using the platform-compatibility-layer functions. In order to avoid problems with the layers #include'ing "loader_platform.h" before they #include system files (which can mess them up), I #include "loader_platform.h" twice. The 2nd time, it #define's the hopefully-temporary macros. Note: For some reason, we can't #define LoadLibrary(). It generates warnings on Windows.
Diffstat (limited to 'layers/multi.cpp')
-rw-r--r--layers/multi.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/layers/multi.cpp b/layers/multi.cpp
index 95514928..3a5e4fcc 100644
--- a/layers/multi.cpp
+++ b/layers/multi.cpp
@@ -30,6 +30,9 @@
#include "loader_platform.h"
#include "xgl_dispatch_table_helper.h"
#include "xglLayer.h"
+// The following is #included again to catch certain OS-specific functions
+// being used:
+#include "loader_platform.h"
static void initLayerTable(const XGL_BASE_LAYER_OBJECT *gpuw, XGL_LAYER_DISPATCH_TABLE *pTable, const unsigned int layerNum);