From 03c3603a3d3d75e78ab1618fe5ccab3d566a7af2 Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Thu, 17 Jul 2008 11:37:49 +0000
Subject: [PATCH] -PCHify OpenGL32

svn path=/trunk/; revision=34562
---
 reactos/dll/win32/opengl32/gl.c            |  9 ++-------
 reactos/dll/win32/opengl32/opengl32.c      | 11 +----------
 reactos/dll/win32/opengl32/opengl32.h      | 19 +++++++++++++++++--
 reactos/dll/win32/opengl32/opengl32.rbuild |  1 +
 reactos/dll/win32/opengl32/teb.h           |  5 -----
 reactos/dll/win32/opengl32/wgl.c           | 15 ---------------
 6 files changed, 21 insertions(+), 39 deletions(-)
 delete mode 100644 reactos/dll/win32/opengl32/teb.h

diff --git a/reactos/dll/win32/opengl32/gl.c b/reactos/dll/win32/opengl32/gl.c
index b8052b0f480..fb2b86dbf83 100644
--- a/reactos/dll/win32/opengl32/gl.c
+++ b/reactos/dll/win32/opengl32/gl.c
@@ -19,16 +19,11 @@
  *
  * On other machines we use C to forward the calls (slow...)
  */
-
-#define WIN32_LEANER_AND_MEANER
-#define WIN32_NO_STATUS
-#include <windows.h>
-#include "teb.h"
+ 
+#include "opengl32.h"
 
 C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8);
 
-#include "opengl32.h"
-
 int STDCALL glEmptyFunc0() { return 0; }
 int STDCALL glEmptyFunc4( long l1 ) { return 0; }
 int STDCALL glEmptyFunc8( long l1, long l2 ) { return 0; }
diff --git a/reactos/dll/win32/opengl32/opengl32.c b/reactos/dll/win32/opengl32/opengl32.c
index c810d1138ec..0f124929b71 100644
--- a/reactos/dll/win32/opengl32/opengl32.c
+++ b/reactos/dll/win32/opengl32/opengl32.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 lib/opengl32/opengl32.c
@@ -9,16 +8,8 @@
  *                       Feb 1, 2004: Created
  */
 
-#define WIN32_LEAN_AND_MEAN
-#define WIN32_NO_STATUS
-#include <windows.h>
-#include <winreg.h>
-#include "teb.h"
-
-#include <string.h>
 #include "opengl32.h"
 
-
 /* function prototypes */
 static void OPENGL32_AppendICD( GLDRIVERDATA *icd );
 static void OPENGL32_RemoveICD( GLDRIVERDATA *icd );
diff --git a/reactos/dll/win32/opengl32/opengl32.h b/reactos/dll/win32/opengl32/opengl32.h
index 8065025cc95..6bee7837960 100644
--- a/reactos/dll/win32/opengl32/opengl32.h
+++ b/reactos/dll/win32/opengl32/opengl32.h
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 lib/opengl32/opengl32.h
@@ -29,6 +28,22 @@ extern "C" {
 #define OPENGL_DRIVERS_SUBKEY L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers"
 #define OPENGL_DRIVERS_SUBKEY2 L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\OpenGLDrivers\\"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define WIN32_LEAN_AND_MEAN
+#define WIN32_NO_STATUS
+#include <windows.h>
+
+#include <winreg.h>
+
+#define NTOS_MODE_USER
+#include <ddraw.h>
+#include <ddrawi.h>
+#include <winddi.h>
+#include <ndk/ntndk.h>
+
 /* gl function list */
 #include "glfuncs.h"
 
diff --git a/reactos/dll/win32/opengl32/opengl32.rbuild b/reactos/dll/win32/opengl32/opengl32.rbuild
index bdd58c619d7..f201ddd4e86 100644
--- a/reactos/dll/win32/opengl32/opengl32.rbuild
+++ b/reactos/dll/win32/opengl32/opengl32.rbuild
@@ -6,6 +6,7 @@
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>advapi32</library>
+	<pch>opengl32.h</pch>
 	<file>gl.c</file>
 	<file>opengl32.c</file>
 	<file>wgl.c</file>
diff --git a/reactos/dll/win32/opengl32/teb.h b/reactos/dll/win32/opengl32/teb.h
deleted file mode 100644
index 84d484b42b9..00000000000
--- a/reactos/dll/win32/opengl32/teb.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// teb.h
-
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
diff --git a/reactos/dll/win32/opengl32/wgl.c b/reactos/dll/win32/opengl32/wgl.c
index 7c1241551e5..2a06854c27a 100644
--- a/reactos/dll/win32/opengl32/wgl.c
+++ b/reactos/dll/win32/opengl32/wgl.c
@@ -8,21 +8,6 @@
  *                       Feb 2, 2004: Created
  */
 
-#define WIN32_LEAN_AND_MEAN
-#define WIN32_NO_STATUS
-#include <windows.h>
-
-#define NTOS_MODE_USER
-#include <ddraw.h>
-#include <ddrawi.h>
-#include <winddi.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "teb.h"
-
 #define OPENGL32_GL_FUNC_PROTOTYPES
 #include "opengl32.h"