Move OpenGL defines to correct place

[Andreas Mohr]

Hi all,

move some OpenGL defines from the private wgl.h header to where they
actually belong.

Andreas Mohr
-------------- next part --------------
Index: dlls/opengl32/wgl.h
===================================================================
RCS file: /home/wine/wine/dlls/opengl32/wgl.h,v
retrieving revision 1.5
diff -u -r1.5 wgl.h
--- dlls/opengl32/wgl.h	20 Jan 2004 22:48:57 -0000	1.5
+++ dlls/opengl32/wgl.h	16 Aug 2004 15:25:20 -0000
@@ -22,50 +22,9 @@
 
 #include "wingdi.h"
 
+/* should be moved to windef.h, but maybe currently depends on being void *? */
 typedef void *HGLRC;
 
-typedef struct {
-  WORD  nSize;
-  WORD  nVersion;
-  DWORD dwFlags;
-  BYTE  iPixelType;
-  BYTE  cColorBits;
-  BYTE  cRedBits;
-  BYTE  cRedShift;
-  BYTE  cGreenBits;
-  BYTE  cGreenShift;
-  BYTE  cBlueBits;
-  BYTE  cBlueShift;
-  BYTE  cAlphaBits;
-  BYTE  cAlphaShift;
-  BYTE  cAccumBits;
-  BYTE  cAccumRedBits;
-  BYTE  cAccumGreenBits;
-  BYTE  cAccumBlueBits;
-  BYTE  cAccumAlphaBits;
-  BYTE  cDepthBits;
-  BYTE  cStencilBits;
-  BYTE  cAuxBuffers;
-  BYTE  iLayerPlane;
-  BYTE  bReserved;
-  COLORREF crTransparent;
-} LAYERPLANEDESCRIPTOR;
-typedef LAYERPLANEDESCRIPTOR* LPLAYERPLANEDESCRIPTOR;
-
-typedef struct {
-  FLOAT      x;
-  FLOAT      y;
-} POINTFLOAT;
-
-typedef struct {
-  FLOAT      gmfBlackBoxX;
-  FLOAT      gmfBlackBoxY;
-  POINTFLOAT gmfptGlyphOrigin;
-  FLOAT      gmfCellIncX;
-  FLOAT      gmfCellIncY;
-} GLYPHMETRICSFLOAT;
-typedef GLYPHMETRICSFLOAT *LPGLYPHMETRICSFLOAT;
-
 HGLRC WINAPI wglCreateContext(HDC hdc) ;
 HGLRC WINAPI wglCreateLayerContext(HDC hdc,
 				   int iLayerPlane) ;
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.107
diff -u -r1.107 wingdi.h
--- include/wingdi.h	8 Jul 2004 20:17:59 -0000	1.107
+++ include/wingdi.h	16 Aug 2004 15:25:22 -0000
@@ -1407,6 +1407,49 @@
 #define TT_PRIM_CSPLINE 3
 #define TT_POLYGON_TYPE 24
 
+  /* OpenGL defines */
+typedef struct {
+  FLOAT      x;
+  FLOAT      y;
+} POINTFLOAT;
+
+typedef struct {
+  FLOAT      gmfBlackBoxX;
+  FLOAT      gmfBlackBoxY;
+  POINTFLOAT gmfptGlyphOrigin;
+  FLOAT      gmfCellIncX;
+  FLOAT      gmfCellIncY;
+} GLYPHMETRICSFLOAT;
+typedef GLYPHMETRICSFLOAT *LPGLYPHMETRICSFLOAT;
+
+typedef struct {
+  WORD  nSize;
+  WORD  nVersion;
+  DWORD dwFlags;
+  BYTE  iPixelType;
+  BYTE  cColorBits;
+  BYTE  cRedBits;
+  BYTE  cRedShift;
+  BYTE  cGreenBits;
+  BYTE  cGreenShift;
+  BYTE  cBlueBits;
+  BYTE  cBlueShift;
+  BYTE  cAlphaBits;
+  BYTE  cAlphaShift;
+  BYTE  cAccumBits;
+  BYTE  cAccumRedBits;
+  BYTE  cAccumGreenBits;
+  BYTE  cAccumBlueBits;
+  BYTE  cAccumAlphaBits;
+  BYTE  cDepthBits;
+  BYTE  cStencilBits;
+  BYTE  cAuxBuffers;
+  BYTE  iLayerPlane;
+  BYTE  bReserved;
+  COLORREF crTransparent;
+} LAYERPLANEDESCRIPTOR;
+typedef LAYERPLANEDESCRIPTOR* LPLAYERPLANEDESCRIPTOR;
+
 /* Get/SetSystemPaletteUse() values */
 #define SYSPAL_ERROR        0
 #define SYSPAL_STATIC       1