From 9efd1ef0be6a3762ebcaa733be50ffb39ac4b117 Mon Sep 17 00:00:00 2001
From: Samuel Serapion <samuel.serapion@gmail.com>
Date: Thu, 25 Sep 2008 05:43:26 +0000
Subject: [PATCH] Convert to spec. Protect _WIN32_WINNT from redefinition
 warning.

svn path=/branches/ros-amd64-bringup/; revision=36505
---
 reactos/dll/win32/glu32/glu32.def       | 60 -------------------------
 reactos/dll/win32/glu32/glu32.rbuild    |  3 +-
 reactos/dll/win32/glu32/glu32.spec      | 53 ++++++++++++++++++++++
 reactos/dll/win32/glu32/include/gluos.h |  4 ++
 4 files changed, 59 insertions(+), 61 deletions(-)
 delete mode 100644 reactos/dll/win32/glu32/glu32.def
 create mode 100644 reactos/dll/win32/glu32/glu32.spec

diff --git a/reactos/dll/win32/glu32/glu32.def b/reactos/dll/win32/glu32/glu32.def
deleted file mode 100644
index d6255b19bed..00000000000
--- a/reactos/dll/win32/glu32/glu32.def
+++ /dev/null
@@ -1,60 +0,0 @@
-EXPORTS
-gluBeginCurve@4
-gluBeginPolygon@4
-gluBeginSurface@4
-gluBeginTrim@4
-gluBuild1DMipmapLevels@36
-gluBuild1DMipmaps@24
-gluBuild2DMipmapLevels@40
-gluBuild2DMipmaps@28
-gluBuild3DMipmapLevels@44
-gluBuild3DMipmaps@32
-gluCheckExtension@8
-gluCylinder@36
-gluDeleteNurbsRenderer@4
-gluDeleteQuadric@4
-gluDeleteTess@4
-gluDisk@28
-gluEndCurve@4
-gluEndPolygon@4
-gluEndSurface@4
-gluEndTrim@4
-gluErrorString@4
-gluGetNurbsProperty@12
-gluGetString@4
-gluGetTessProperty@12
-gluLoadSamplingMatrices@16
-gluLookAt@72
-gluNewNurbsRenderer@0
-gluNewQuadric@0
-gluNewTess@0
-gluNextContour@8
-gluNurbsCallback@12
-gluNurbsCallbackData@8
-gluNurbsCallbackDataEXT@8
-gluNurbsCurve@28
-gluNurbsProperty@12
-gluNurbsSurface@44
-gluOrtho2D@32
-gluPartialDisk@44
-gluPerspective@32
-gluPickMatrix@36
-gluProject@48
-gluPwlCurve@20
-gluQuadricCallback@12
-gluQuadricDrawStyle@8
-gluQuadricNormals@8
-gluQuadricOrientation@8
-gluQuadricTexture@8
-gluScaleImage@36
-gluSphere@20
-gluTessBeginContour@4
-gluTessBeginPolygon@8
-gluTessCallback@12
-gluTessEndContour@4
-gluTessEndPolygon@4
-gluTessNormal@28
-gluTessProperty@16
-gluTessVertex@12
-gluUnProject@48
-gluUnProject4@76
diff --git a/reactos/dll/win32/glu32/glu32.rbuild b/reactos/dll/win32/glu32/glu32.rbuild
index 4668301fc52..cb2aab1f3ea 100644
--- a/reactos/dll/win32/glu32/glu32.rbuild
+++ b/reactos/dll/win32/glu32/glu32.rbuild
@@ -1,5 +1,5 @@
 <module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true">
-	<importlibrary definition="glu32.def" />
+	<importlibrary definition="glu32.spec.def" />
 	<include base="glu32">include</include>
 	<include base="glu32">libnurbs/internals</include>
 	<include base="glu32">libnurbs/interface</include>
@@ -14,6 +14,7 @@
 	<library>opengl32</library>
 	<library>kernel32</library>
 	<library>gdi32</library>
+	<file>glu32.spec</file>
 	<directory name="libnurbs">
 		<directory name="interface">
 			<file>bezierEval.cc</file>
diff --git a/reactos/dll/win32/glu32/glu32.spec b/reactos/dll/win32/glu32/glu32.spec
new file mode 100644
index 00000000000..392f187fd0e
--- /dev/null
+++ b/reactos/dll/win32/glu32/glu32.spec
@@ -0,0 +1,53 @@
+@ stdcall gluBeginCurve(ptr) 
+@ stdcall gluBeginPolygon(ptr) 
+@ stdcall gluBeginSurface(ptr) 
+@ stdcall gluBeginTrim(ptr) 
+@ stdcall gluBuild1DMipmaps(long long long long long ptr) 
+@ stdcall gluBuild2DMipmaps(long long long long long long ptr) 
+@ stdcall gluCheckExtension(str ptr) 
+@ stdcall gluCylinder(ptr double double double long long) 
+@ stdcall gluDeleteNurbsRenderer(ptr) 
+@ stdcall gluDeleteQuadric(ptr) 
+@ stdcall gluDeleteTess(ptr) 
+@ stdcall gluDisk(ptr double double long long) 
+@ stdcall gluEndCurve(ptr) 
+@ stdcall gluEndPolygon(ptr) 
+@ stdcall gluEndSurface(ptr) 
+@ stdcall gluEndTrim(ptr) 
+@ stdcall gluErrorString(long) 
+@ stub gluErrorUnicodeStringEXT
+@ stdcall gluGetNurbsProperty(ptr long ptr) 
+@ stdcall gluGetString(long) 
+@ stdcall gluGetTessProperty(ptr long double)
+@ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) 
+@ stdcall gluLookAt(double double double double double double double double double) 
+@ stdcall gluNewNurbsRenderer() 
+@ stdcall gluNewQuadric() 
+@ stdcall gluNewTess() 
+@ stdcall gluNextContour(ptr long) 
+@ stdcall gluNurbsCallback(ptr long ptr) 
+@ stdcall gluNurbsCurve(ptr long ptr long ptr long long) 
+@ stdcall gluNurbsProperty(ptr long long) 
+@ stdcall gluNurbsSurface(ptr long ptr long ptr long long ptr long long long) 
+@ stdcall gluOrtho2D(double double double double) 
+@ stdcall gluPartialDisk(ptr double double long long double double) 
+@ stdcall gluPerspective(double double double double) 
+@ stdcall gluPickMatrix(double double double double ptr) 
+@ stdcall gluProject(double double double ptr ptr ptr ptr ptr ptr) 
+@ stdcall gluPwlCurve(ptr long ptr long long) 
+@ stdcall gluQuadricCallback(ptr long ptr) 
+@ stdcall gluQuadricDrawStyle(ptr long) 
+@ stdcall gluQuadricNormals(ptr long) 
+@ stdcall gluQuadricOrientation(ptr long) 
+@ stdcall gluQuadricTexture(ptr long) 
+@ stdcall gluScaleImage(long long long long ptr long long long ptr) 
+@ stdcall gluSphere(ptr double long long) 
+@ stdcall gluTessBeginContour(ptr) 
+@ stdcall gluTessBeginPolygon(ptr ptr) 
+@ stdcall gluTessCallback(ptr long ptr) 
+@ stdcall gluTessEndContour(ptr) 
+@ stdcall gluTessEndPolygon(ptr) 
+@ stdcall gluTessNormal(ptr double double double) 
+@ stdcall gluTessProperty(ptr long double) 
+@ stdcall gluTessVertex(ptr ptr ptr) 
+@ stdcall gluUnProject(double double double ptr ptr ptr ptr ptr ptr) 
\ No newline at end of file
diff --git a/reactos/dll/win32/glu32/include/gluos.h b/reactos/dll/win32/glu32/include/gluos.h
index 755e8b6890c..9675bd78e54 100644
--- a/reactos/dll/win32/glu32/include/gluos.h
+++ b/reactos/dll/win32/glu32/include/gluos.h
@@ -40,7 +40,11 @@
 #define NOIME
 #define NOMINMAX
 
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
 #define _WIN32_WINNT 0x0400
+
 #ifndef STRICT
   #define STRICT 1
 #endif