From d67a27df65f5ae318a52e3913f3d175242b3d7e9 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Mar 2017 19:56:21 +0000 Subject: [PATCH] Fix SDL check_header_includes=1 build Type `SyncGLMethod` was defined conditional on DXX_USE_OGL, but header `common/include/ogl_sync.h` used `SyncGLMethod` unconditionally. This works fine in the normal build since SDL builds never include `common/include/ogl_sync.h`, but broke the check_header_includes=1 test since that compiles `common/include/ogl_sync.h` even for SDL builds. Wrap type `ogl_sync` in `#if DXX_USE_OGL` to hide it from the check_header_includes=1 test in SDL mode. --- common/include/ogl_sync.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/include/ogl_sync.h b/common/include/ogl_sync.h index aac7ca0b1..9c3e9fa91 100644 --- a/common/include/ogl_sync.h +++ b/common/include/ogl_sync.h @@ -19,6 +19,7 @@ namespace dcx { +#if DXX_USE_OGL class ogl_sync { class sync_deleter { @@ -39,5 +40,6 @@ class ogl_sync { void init(SyncGLMethod sync_method, int wait); void deinit(); }; +#endif }