Roderick Colenbrander : x11drv: Fix building issue.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8be92001e64f73174bcd7e330538d194203adcf7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8be92001e64f73174bcd7e330538d194203adcf7

Author: Roderick Colenbrander <thunderbird2k at gmx.net>
Date:   Thu Oct  5 20:57:07 2006 +0200

x11drv: Fix building issue.

---

 dlls/opengl32/opengl_ext.h |   11 -----------
 include/wine/wgl.h         |   11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h
index a7fe233..c501399 100644
--- a/dlls/opengl32/opengl_ext.h
+++ b/dlls/opengl32/opengl_ext.h
@@ -41,17 +41,6 @@ #define CALLBACK    __stdcall
 #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);
diff --git a/include/wine/wgl.h b/include/wine/wgl.h
index 66fb1b0..e191407 100644
--- 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