[ros-diffs] [sserapion] 36505: Convert to spec. Protect _WIN32_WINNT from redefinition warning.

Author: sserapion
Date: Thu Sep 25 00:43:26 2008
New Revision: 36505

URL: http://svn.reactos.org/svn/reactos?rev=36505&view=rev
Log:
Convert to spec.
Protect _WIN32_WINNT from redefinition warning.

Added:
    branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec   (contents, props
changed)
      - copied, changed from r36479,
branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def
Removed:
    branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def
Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h

Removed: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def (removed)
@@ -1,60 +1,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

Modified: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Thu Sep
25 00:43:26 2008
@@ -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>

Copied: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec (from r36479,
branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def)
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec [iso-8859-1] Thu Sep 25
00:43:26 2008
@@ -1,60 +1,53 @@
-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
+@ 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) 

Propchange: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Propchange: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] Thu
Sep 25 00:43:26 2008
@@ -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