x11drv: Fix building issue.

8be92001 · Roderick Colenbrander · Alexandre Julliard · 67436f9d · 8be92001 · 8be92001
Commit 8be92001 authored Oct 05, 2006 by Roderick Colenbrander Committed by Alexandre Julliard Oct 06, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 11 deletions

opengl_ext.h dlls/opengl32/opengl_ext.h +0 -11

wgl.h include/wine/wgl.h +11 -0

No files found.
--- a/dlls/opengl32/opengl_ext.h
+++ b/dlls/opengl32/opengl_ext.h
@@ -41,17 +41,6 @@
 #define WINAPI      __stdcall
 #define APIENTRY    WINAPI

-/* For compatibility with old Mesa headers */
-#ifndef GLX_SAMPLE_BUFFERS_ARB
-# define GLX_SAMPLE_BUFFERS_ARB             100000
-#endif
-#ifndef GLX_SAMPLES_ARB
-# define GLX_SAMPLES_ARB                    100001
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP
-# define GL_TEXTURE_CUBE_MAP 0x8513
-#endif
-
 /* X11 locking */

 extern void (*wine_tsx11_lock_ptr)(void);

--- a/include/wine/wgl.h
+++ b/include/wine/wgl.h
@@ -20,6 +20,17 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+/* For compatibility with old Mesa headers */
+#ifndef GLX_SAMPLE_BUFFERS_ARB
+# define GLX_SAMPLE_BUFFERS_ARB             100000
+#endif
+#ifndef GLX_SAMPLES_ARB
+# define GLX_SAMPLES_ARB                    100001
+#endif
+#ifndef GL_TEXTURE_CUBE_MAP
+# define GL_TEXTURE_CUBE_MAP 0x8513
+#endif
+
 #define HPBUFFERARB void *

 #define WGL_NUMBER_PIXEL_FORMATS_ARB		0x2000