[sserapion] 36502: - Convert to spec. - No need to assert an offset thats only used in i386 specific code.

Author: sserapion
Date: Wed Sep 24 23:27:03 2008
New Revision: 36502

URL: http://svn.reactos.org/svn/reactos?rev=36502&view=rev
Log:
- Convert to spec.
- No need to assert an offset thats only used in i386 specific code.

Added:
    branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec   (contents, props
changed)
      - copied, changed from r36479,
branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def
Removed:
    branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def
Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c
    branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild

Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/gl.c [iso-8859-1] Wed Sep 24
23:27:03 2008
@@ -22,7 +22,9 @@
  
 #include "opengl32.h"
 
+#if defined(_M_IX86)
 C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8);
+#endif
 
 int STDCALL glEmptyFunc0() { return 0; }
 int STDCALL glEmptyFunc4( long l1 ) { return 0; }

Removed: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def (removed)
@@ -1,401 +1,0 @@
-; $Id$
-;
-; opengl32.def
-;
-; ReactOS Operating System
-;
-LIBRARY opengl32.dll
-EXPORTS
-;DllInitialize
-
-glAccum@8
-glAlphaFunc@8
-glAreTexturesResident@12
-glArrayElement@4
-glBegin@4
-glBindTexture@8
-glBitmap@28
-glBlendFunc@8
-glCallList@4
-glCallLists@12
-glClear@4
-glClearAccum@16
-glClearColor@16
-glClearDepth@8
-glClearIndex@4
-glClearStencil@4
-glClipPlane@8
-
-glColor3b@12
-glColor3bv@4
-glColor3d@24
-glColor3dv@4
-glColor3f@12
-glColor3fv@4
-glColor3i@12
-glColor3iv@4
-glColor3s@12
-glColor3sv@4
-glColor3ub@12
-glColor3ubv@4
-glColor3ui@12
-glColor3uiv@4
-glColor3us@12
-glColor3usv@4
-
-glColor4b@16
-glColor4bv@4
-glColor4d@32
-glColor4dv@4
-glColor4f@16
-glColor4fv@4
-glColor4i@16
-glColor4iv@4
-glColor4s@16
-glColor4sv@4
-glColor4ub@16
-glColor4ubv@4
-glColor4ui@16
-glColor4uiv@4
-glColor4us@16
-glColor4usv@4
-
-glColorMask@16
-glColorMaterial@8
-glColorPointer@16
-glCopyPixels@20
-glCopyTexImage1D@28
-glCopyTexImage2D@32
-glCopyTexSubImage1D@24
-glCopyTexSubImage2D@32
-glCullFace@4
-;glDebugEntry
-glDeleteLists@8
-glDeleteTextures@8
-glDepthFunc@4
-glDepthMask@4
-glDepthRange@16
-glDisable@4
-glDisableClientState@4
-glDrawArrays@12
-glDrawBuffer@4
-glDrawElements@16
-glDrawPixels@20
-glEdgeFlag@4
-glEdgeFlagPointer@8
-glEdgeFlagv@4
-glEnable@4
-glEnableClientState@4
-glEnd@0
-glEndList@0
-
-glEvalCoord1d@8
-glEvalCoord1dv@4
-glEvalCoord1f@4
-glEvalCoord1fv@4
-glEvalCoord2d@16
-glEvalCoord2dv@4
-glEvalCoord2f@8
-glEvalCoord2fv@4
-
-glEvalMesh1@12
-glEvalMesh2@20
-glEvalPoint1@4
-glEvalPoint2@8
-glFeedbackBuffer@12
-glFinish@0
-glFlush@0
-glFogf@8
-glFogfv@8
-glFogi@8
-glFogiv@8
-glFrontFace@4
-glFrustum@48
-glGenLists@4
-glGenTextures@8
-glGetBooleanv@8
-glGetClipPlane@8
-glGetDoublev@8
-glGetError@0
-glGetFloatv@8
-glGetIntegerv@8
-glGetLightfv@12
-glGetLightiv@12
-glGetMapdv@12
-glGetMapfv@12
-glGetMapiv@12
-glGetMaterialfv@12
-glGetMaterialiv@12
-glGetPixelMapfv@8
-glGetPixelMapuiv@8
-glGetPixelMapusv@8
-glGetPointerv@8
-glGetPolygonStipple@4
-glGetString@4
-glGetTexEnvfv@12
-glGetTexEnviv@12
-glGetTexGendv@12
-glGetTexGenfv@12
-glGetTexGeniv@12
-glGetTexImage@20
-glGetTexLevelParameterfv@16
-glGetTexLevelParameteriv@16
-glGetTexParameterfv@12
-glGetTexParameteriv@12
-glHint@8
-glIndexd@8
-glIndexdv@4
-glIndexf@4
-glIndexfv@4
-glIndexi@4
-glIndexiv@4
-glIndexMask@4
-glIndexPointer@12
-glIndexs@4
-glIndexsv@4
-glIndexub@4
-glIndexubv@4
-glInitNames@0
-glInterleavedArrays@12
-glIsEnabled@4
-glIsList@4
-glIsTexture@4
-
-glLightf@12
-glLightfv@12
-glLighti@12
-glLightiv@12
-glLightModelf@8
-glLightModelfv@8
-glLightModeli@8
-glLightModeliv@8
-
-glLineStipple@8
-glLineWidth@4
-glListBase@4
-glLoadIdentity@0
-glLoadMatrixd@4
-glLoadMatrixf@4
-glLoadName@4
-glLogicOp@4
-
-glMap1d@32
-glMap1f@24
-glMap2d@56
-glMap2f@40
-glMapGrid1d@20
-glMapGrid1f@12
-glMapGrid2d@40
-glMapGrid2f@24
-
-glMaterialf@12
-glMaterialfv@12
-glMateriali@12
-glMaterialiv@12
-
-glMatrixMode@4
-;GlmfBeginGlsBlock
-;GlmfCloseMetaFile
-;GlmfEndGlsBlock
-;GlmfEndPlayback
-;GlmfInitPlayback
-;GlmfPlayGlsRecord
-glMultMatrixd@4
-glMultMatrixf@4
-glNewList@8
-
-glNormal3b@12
-glNormal3bv@4
-glNormal3d@24
-glNormal3dv@4
-glNormal3f@12
-glNormal3fv@4
-glNormal3i@12
-glNormal3iv@4
-glNormal3s@12
-glNormal3sv@4
-glNormalPointer@12
-
-glOrtho@48
-glPassThrough@4
-glPixelMapfv@12
-glPixelMapuiv@12
-glPixelMapusv@12
-glPixelStoref@8
-glPixelStorei@8
-glPixelTransferf@8
-glPixelTransferi@8
-glPixelZoom@8
-glPointSize@4
-glPolygonMode@8
-glPolygonOffset@8
-glPolygonStipple@4
-glPopAttrib@0
-glPopClientAttrib@0
-glPopMatrix@0
-glPopName@0
-glPrioritizeTextures@12
-glPushAttrib@4
-glPushClientAttrib@4
-glPushMatrix@0
-glPushName@4
-glRasterPos2d@16
-glRasterPos2dv@4
-glRasterPos2f@8
-glRasterPos2fv@4
-glRasterPos2i@8
-glRasterPos2iv@4
-glRasterPos2s@8
-glRasterPos2sv@4
-glRasterPos3d@24
-glRasterPos3dv@4
-glRasterPos3f@12
-glRasterPos3fv@4
-glRasterPos3i@12
-glRasterPos3iv@4
-glRasterPos3s@12
-glRasterPos3sv@4
-glRasterPos4d@32
-glRasterPos4dv@4
-glRasterPos4f@16
-glRasterPos4fv@4
-glRasterPos4i@16
-glRasterPos4iv@4
-glRasterPos4s@16
-glRasterPos4sv@4
-glReadBuffer@4
-glReadPixels@28
-glRectd@32
-glRectdv@8
-glRectf@16
-glRectfv@8
-glRecti@16
-glRectiv@8
-glRects@16
-glRectsv@8
-glRenderMode@4
-glRotated@32
-glRotatef@16
-glScaled@24
-glScalef@12
-glScissor@16
-glSelectBuffer@8
-glShadeModel@4
-glStencilFunc@12
-glStencilMask@4
-glStencilOp@12
-
-glTexCoord1d@8
-glTexCoord1dv@4
-glTexCoord1f@4
-glTexCoord1fv@4
-glTexCoord1i@4
-glTexCoord1iv@4
-glTexCoord1s@4
-glTexCoord1sv@4
-
-glTexCoord2d@16
-glTexCoord2dv@4
-glTexCoord2f@8
-glTexCoord2fv@4
-glTexCoord2i@8
-glTexCoord2iv@4
-glTexCoord2s@8
-glTexCoord2sv@4
-
-glTexCoord3d@24
-glTexCoord3dv@4
-glTexCoord3f@12
-glTexCoord3fv@4
-glTexCoord3i@12
-glTexCoord3iv@4
-glTexCoord3s@12
-glTexCoord3sv@4
-
-glTexCoord4d@32
-glTexCoord4dv@4
-glTexCoord4f@16
-glTexCoord4fv@4
-glTexCoord4i@16
-glTexCoord4iv@4
-glTexCoord4s@16
-glTexCoord4sv@4
-
-glTexCoordPointer@16
-glTexEnvf@12
-glTexEnvfv@12
-glTexEnvi@12
-glTexEnviv@12
-glTexGend@16
-glTexGendv@12
-glTexGenf@12
-glTexGenfv@12
-glTexGeni@12
-glTexGeniv@12
-glTexImage1D@32
-glTexImage2D@36
-glTexParameterf@12
-glTexParameterfv@12
-glTexParameteri@12
-glTexParameteriv@12
-glTexSubImage1D@28
-glTexSubImage2D@36
-
-glTranslated@24
-glTranslatef@12
-
-glVertex2d@16
-glVertex2dv@4
-glVertex2f@8
-glVertex2fv@4
-glVertex2i@8
-glVertex2iv@4
-glVertex2s@8
-glVertex2sv@4
-
-glVertex3d@24
-glVertex3dv@4
-glVertex3f@12
-glVertex3fv@4
-glVertex3i@12
-glVertex3iv@4
-glVertex3s@12
-glVertex3sv@4
-
-glVertex4d@32
-glVertex4dv@4
-glVertex4f@16
-glVertex4fv@4
-glVertex4i@16
-glVertex4iv@4
-glVertex4s@16
-glVertex4sv@4
-
-glVertexPointer@16
-glViewport@16
-
-wglChoosePixelFormat@8=rosglChoosePixelFormat@8
-wglCopyContext@12=rosglCopyContext@12
-wglCreateContext@4=rosglCreateContext@4
-wglCreateLayerContext@8=rosglCreateLayerContext@8
-wglDeleteContext@4=rosglDeleteContext@4
-wglDescribeLayerPlane@20=rosglDescribeLayerPlane@20
-wglDescribePixelFormat@16=rosglDescribePixelFormat@16
-wglGetCurrentContext@0=rosglGetCurrentContext@0
-wglGetCurrentDC@0=rosglGetCurrentDC@0
-wglGetDefaultProcAddress@4=rosglGetDefaultProcAddress@4
-wglGetLayerPaletteEntries@20=rosglGetLayerPaletteEntries@20
-wglGetPixelFormat@4=rosglGetPixelFormat@4
-wglGetProcAddress@4=rosglGetProcAddress@4
-wglMakeCurrent@8=rosglMakeCurrent@8
-wglRealizeLayerPalette@12=rosglRealizeLayerPalette@12
-wglSetLayerPaletteEntries@20=rosglSetLayerPaletteEntries@20
-wglSetPixelFormat@12=rosglSetPixelFormat@12
-wglShareLists@8=rosglShareLists@8
-wglSwapBuffers@4=rosglSwapBuffers@4
-wglSwapLayerBuffers@8=rosglSwapLayerBuffers@8
-;wglSwapMultipleBuffers=rosglSwapMultipleBuffers@
-wglUseFontBitmapsA@16=rosglUseFontBitmapsA@16
-wglUseFontBitmapsW@16=rosglUseFontBitmapsW@16
-wglUseFontOutlinesA@32=rosglUseFontOutlinesA@32
-wglUseFontOutlinesW@32=rosglUseFontOutlinesW@32

Modified: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] Wed
Sep 24 23:27:03 2008
@@ -1,5 +1,5 @@
 <module name="opengl32" type="win32dll"
baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32"
installname="opengl32.dll" unicode="yes">
-	<importlibrary definition="opengl32.def" />
+	<importlibrary definition="opengl32.spec.def" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>ntdll</library>
 	<library>kernel32</library>
@@ -10,4 +10,5 @@
 	<file>gl.c</file>
 	<file>opengl32.c</file>
 	<file>wgl.c</file>
+	<file>opengl32.spec</file>
 </module>

Copied: branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec (from r36479,
branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def)
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.def [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/opengl32/opengl32.spec [iso-8859-1] Wed
Sep 24 23:27:03 2008
@@ -1,401 +1,401 @@
-; $Id$
-;
-; opengl32.def
-;
-; ReactOS Operating System
-;
-LIBRARY opengl32.dll
-EXPORTS
-;DllInitialize
+@  stdcall glAccum( long long )
+@  stdcall glAlphaFunc( long long )
+@  stdcall glAreTexturesResident( long ptr ptr )
+@  stdcall glArrayElement( long ) 
+@  stdcall glBegin( long ) 
+@  stdcall glBindTexture( long long ) 
+@  stdcall glBitmap( long long long long long long ptr ) 
+#@  stdcall glBlendColor( long long long long ) 
+#@  stdcall glBlendEquation( long ) 
+@  stdcall glBlendFunc( long long ) 
+@  stdcall glCallList( long ) 
+@  stdcall glCallLists( long long ptr ) 
+@  stdcall glClear( long ) 
+@  stdcall glClearAccum( long long long long ) 
+@  stdcall glClearColor( long long long long ) 
+@  stdcall glClearDepth( double ) 
+@  stdcall glClearIndex( long ) 
+@  stdcall glClearStencil( long ) 
+@  stdcall glClipPlane( long ptr ) 
+@  stdcall glColor3b( long long long ) 
+@  stdcall glColor3bv( ptr ) 
+@  stdcall glColor3d( double double double ) 
+@  stdcall glColor3dv( ptr ) 
+@  stdcall glColor3f( long long long ) 
+@  stdcall glColor3fv( ptr ) 
+@  stdcall glColor3i( long long long ) 
+@  stdcall glColor3iv( ptr ) 
+@  stdcall glColor3s( long long long ) 
+@  stdcall glColor3sv( ptr ) 
+@  stdcall glColor3ub( long long long ) 
+@  stdcall glColor3ubv( ptr ) 
+@  stdcall glColor3ui( long long long ) 
+@  stdcall glColor3uiv( ptr ) 
+@  stdcall glColor3us( long long long ) 
+@  stdcall glColor3usv( ptr ) 
+@  stdcall glColor4b( long long long long ) 
+@  stdcall glColor4bv( ptr ) 
+@  stdcall glColor4d( double double double double ) 
+@  stdcall glColor4dv( ptr ) 
+@  stdcall glColor4f( long long long long ) 
+@  stdcall glColor4fv( ptr ) 
+@  stdcall glColor4i( long long long long ) 
+@  stdcall glColor4iv( ptr ) 
+@  stdcall glColor4s( long long long long ) 
+@  stdcall glColor4sv( ptr ) 
+@  stdcall glColor4ub( long long long long ) 
+@  stdcall glColor4ubv( ptr ) 
+@  stdcall glColor4ui( long long long long ) 
+@  stdcall glColor4uiv( ptr ) 
+@  stdcall glColor4us( long long long long ) 
+@  stdcall glColor4usv( ptr ) 
+@  stdcall glColorMask( long long long long ) 
+@  stdcall glColorMaterial( long long ) 
+@  stdcall glColorPointer( long long long ptr ) 
+#@  stdcall glColorSubTable( long long long long long ptr ) 
+#@  stdcall glColorTable( long long long long long ptr ) 
+#@  stdcall glColorTableParameterfv( long long ptr ) 
+#@  stdcall glColorTableParameteriv( long long ptr ) 
+#@  stdcall glConvolutionFilter1D( long long long long long ptr ) 
+#@  stdcall glConvolutionFilter2D( long long long long long long ptr ) 
+#@  stdcall glConvolutionParameterf( long long long ) 
+#@  stdcall glConvolutionParameterfv( long long ptr ) 
+#@  stdcall glConvolutionParameteri( long long long ) 
+#@  stdcall glConvolutionParameteriv( long long ptr ) 
+#@  stdcall glCopyColorSubTable( long long long long long ) 
+#@  stdcall glCopyColorTable( long long long long long ) 
+#@  stdcall glCopyConvolutionFilter1D( long long long long long ) 
+#@  stdcall glCopyConvolutionFilter2D( long long long long long long ) 
+@  stdcall glCopyPixels( long long long long long ) 
+@  stdcall glCopyTexImage1D( long long long long long long long ) 
+@  stdcall glCopyTexImage2D( long long long long long long long long ) 
+@  stdcall glCopyTexSubImage1D( long long long long long long ) 
+@  stdcall glCopyTexSubImage2D( long long long long long long long long ) 
+#@  stdcall glCopyTexSubImage3D( long long long long long long long long long ) 
+@  stdcall glCullFace( long )
+@  stdcall glDeleteLists( long long ) 
+@  stdcall glDeleteTextures( long ptr ) 
+@  stdcall glDepthFunc( long ) 
+@  stdcall glDepthMask( long ) 
+@  stdcall glDepthRange( double double ) 
+@  stdcall glDisable( long ) 
+@  stdcall glDisableClientState( long ) 
+@  stdcall glDrawArrays( long long long ) 
+@  stdcall glDrawBuffer( long ) 
+@  stdcall glDrawElements( long long long ptr ) 
+@  stdcall glDrawPixels( long long long long ptr ) 
+#@  stdcall glDrawRangeElements( long long long long long ptr ) 
+@  stdcall glEdgeFlag( long ) 
+@  stdcall glEdgeFlagPointer( long ptr ) 
+@  stdcall glEdgeFlagv( ptr ) 
+@  stdcall glEnable( long ) 
+@  stdcall glEnableClientState( long ) 
+@  stdcall glEnd( ) 
+@  stdcall glEndList( ) 
+@  stdcall glEvalCoord1d( double ) 
+@  stdcall glEvalCoord1dv( ptr ) 
+@  stdcall glEvalCoord1f( long ) 
+@  stdcall glEvalCoord1fv( ptr ) 
+@  stdcall glEvalCoord2d( double double )
+@  stdcall glEvalCoord2dv( ptr ) 
+@  stdcall glEvalCoord2f( long long ) 
+@  stdcall glEvalCoord2fv( ptr ) 
+@  stdcall glEvalMesh1( long long long ) 
+@  stdcall glEvalMesh2( long long long long long ) 
+@  stdcall glEvalPoint1( long ) 
+@  stdcall glEvalPoint2( long long ) 
+@  stdcall glFeedbackBuffer( long long ptr ) 
+@  stdcall glFinish( ) 
+@  stdcall glFlush( ) 
+@  stdcall glFogf( long long ) 
+@  stdcall glFogfv( long ptr ) 
+@  stdcall glFogi( long long ) 
+@  stdcall glFogiv( long ptr ) 
+@  stdcall glFrontFace( long ) 
+@  stdcall glFrustum( double double double double double double ) 
+@  stdcall glGenLists( long ) 
+@  stdcall glGenTextures( long ptr ) 
+@  stdcall glGetBooleanv( long ptr ) 
+@  stdcall glGetClipPlane( long ptr ) 
+#@  stdcall glGetColorTable( long long long ptr ) 
+#@  stdcall glGetColorTableParameterfv( long long ptr ) 
+#@  stdcall glGetColorTableParameteriv( long long ptr ) 
+#@  stdcall glGetConvolutionFilter( long long long ptr ) 
+#@  stdcall glGetConvolutionParameterfv( long long ptr ) 
+#@  stdcall glGetConvolutionParameteriv( long long ptr ) 
+@  stdcall glGetDoublev( long ptr ) 
+@  stdcall glGetError( ) 
+@  stdcall glGetFloatv( long ptr ) 
+#@  stdcall glGetHistogram( long long long long ptr ) 
+#@  stdcall glGetHistogramParameterfv( long long ptr ) 
+#@  stdcall glGetHistogramParameteriv( long long ptr ) 
+@  stdcall glGetIntegerv( long ptr ) 
+@  stub    glGetLevelParameterfv
+@  stub    glGetLevelParameteriv
+@  stdcall glGetLightfv( long long ptr ) 
+@  stdcall glGetLightiv( long long ptr ) 
+@  stdcall glGetMapdv( long long ptr ) 
+@  stdcall glGetMapfv( long long ptr ) 
+@  stdcall glGetMapiv( long long ptr ) 
+@  stdcall glGetMaterialfv( long long ptr ) 
+@  stdcall glGetMaterialiv( long long ptr ) 
+#@  stdcall glGetMinmax( long long long long ptr ) 
+#@  stdcall glGetMinmaxParameterfv( long long ptr ) 
+#@  stdcall glGetMinmaxParameteriv( long long ptr ) 
+@  stdcall glGetPixelMapfv( long ptr ) 
+@  stdcall glGetPixelMapuiv( long ptr ) 
+@  stdcall glGetPixelMapusv( long ptr ) 
+@  stdcall glGetPointerv( long ptr ) 
+@  stdcall glGetPolygonStipple( ptr ) 
+#@  stdcall glGetSeparableFilter( long long long ptr ptr ptr ) 
+@  stdcall glGetString( long ) 
+@  stdcall glGetTexEnvfv( long long ptr ) 
+@  stdcall glGetTexEnviv( long long ptr ) 
+@  stdcall glGetTexGendv( long long ptr ) 
+@  stdcall glGetTexGenfv( long long ptr ) 
+@  stdcall glGetTexGeniv( long long ptr ) 
+@  stdcall glGetTexImage( long long long long ptr ) 
+@  stdcall glGetTexLevelParameterfv( long long long ptr ) 
+@  stdcall glGetTexLevelParameteriv( long long long ptr ) 
+@  stdcall glGetTexParameterfv( long long ptr ) 
+@  stdcall glGetTexParameteriv( long long ptr ) 
+@  stdcall glHint( long long )
+#@  stdcall glHistogram( long long long long ) 
+@  stdcall glIndexMask( long ) 
+@  stdcall glIndexPointer( long long ptr ) 
+@  stdcall glIndexd( double ) 
+@  stdcall glIndexdv( ptr ) 
+@  stdcall glIndexf( long ) 
+@  stdcall glIndexfv( ptr ) 
+@  stdcall glIndexi( long ) 
+@  stdcall glIndexiv( ptr )
+@  stdcall glIndexs( long ) 
+@  stdcall glIndexsv( ptr ) 
+@  stdcall glIndexub( long ) 
+@  stdcall glIndexubv( ptr ) 
+@  stdcall glInitNames( ) 
+@  stdcall glInterleavedArrays( long long ptr ) 
+@  stdcall glIsEnabled( long ) 
+@  stdcall glIsList( long ) 
+@  stdcall glIsTexture( long ) 
+@  stdcall glLightModelf( long long ) 
+@  stdcall glLightModelfv( long ptr ) 
+@  stdcall glLightModeli( long long ) 
+@  stdcall glLightModeliv( long ptr ) 
+@  stdcall glLightf( long long long ) 
+@  stdcall glLightfv( long long ptr ) 
+@  stdcall glLighti( long long long ) 
+@  stdcall glLightiv( long long ptr ) 
+@  stdcall glLineStipple( long long ) 
+@  stdcall glLineWidth( long ) 
+@  stdcall glListBase( long ) 
+@  stdcall glLoadIdentity( ) 
+@  stdcall glLoadMatrixd( ptr ) 
+@  stdcall glLoadMatrixf( ptr ) 
+@  stdcall glLoadName( long ) 
+@  stdcall glLogicOp( long ) 
+@  stdcall glMap1d( long double double long long ptr ) 
+@  stdcall glMap1f( long long long long long ptr ) 
+@  stdcall glMap2d( long double double long long double double long long ptr ) 
+@  stdcall glMap2f( long long long long long long long long long ptr ) 
+@  stdcall glMapGrid1d( long double double ) 
+@  stdcall glMapGrid1f( long long long )
+@  stdcall glMapGrid2d( long double double long double double ) 
+@  stdcall glMapGrid2f( long long long long long long ) 
+@  stdcall glMaterialf( long long long ) 
+@  stdcall glMaterialfv( long long ptr ) 
+@  stdcall glMateriali( long long long ) 
+@  stdcall glMaterialiv( long long ptr ) 
+@  stdcall glMatrixMode( long ) 
+#@  stdcall glMinmax( long long long ) 
+@  stdcall glMultMatrixd( ptr ) 
+@  stdcall glMultMatrixf( ptr ) 
+@  stdcall glNewList( long long ) 
+@  stdcall glNormal3b( long long long ) 
+@  stdcall glNormal3bv( ptr ) 
+@  stdcall glNormal3d( double double double ) 
+@  stdcall glNormal3dv( ptr ) 
+@  stdcall glNormal3f( long long long ) 
+@  stdcall glNormal3fv( ptr ) 
+@  stdcall glNormal3i( long long long ) 
+@  stdcall glNormal3iv( ptr )
+@  stdcall glNormal3s( long long long ) 
+@  stdcall glNormal3sv( ptr ) 
+@  stdcall glNormalPointer( long long ptr ) 
+@  stdcall glOrtho( double double double double double double ) 
+@  stdcall glPassThrough( long ) 
+@  stdcall glPixelMapfv( long long ptr ) 
+@  stdcall glPixelMapuiv( long long ptr ) 
+@  stdcall glPixelMapusv( long long ptr ) 
+@  stdcall glPixelStoref( long long ) 
+@  stdcall glPixelStorei( long long ) 
+@  stdcall glPixelTransferf( long long ) 
+@  stdcall glPixelTransferi( long long ) 
+@  stdcall glPixelZoom( long long ) 
+@  stdcall glPointSize( long ) 
+@  stdcall glPolygonMode( long long ) 
+@  stdcall glPolygonOffset( long long ) 
+@  stdcall glPolygonStipple( ptr ) 
+@  stdcall glPopAttrib( ) 
+@  stdcall glPopClientAttrib( ) 
+@  stdcall glPopMatrix( ) 
+@  stdcall glPopName( ) 
+@  stdcall glPrioritizeTextures( long ptr ptr ) 
+@  stdcall glPushAttrib( long ) 
+@  stdcall glPushClientAttrib( long ) 
+@  stdcall glPushMatrix( ) 
+@  stdcall glPushName( long ) 
+@  stdcall glRasterPos2d( double double ) 
+@  stdcall glRasterPos2dv( ptr ) 
+@  stdcall glRasterPos2f( long long ) 
+@  stdcall glRasterPos2fv( ptr ) 
+@  stdcall glRasterPos2i( long long ) 
+@  stdcall glRasterPos2iv( ptr ) 
+@  stdcall glRasterPos2s( long long ) 
+@  stdcall glRasterPos2sv( ptr ) 
+@  stdcall glRasterPos3d( double double double ) 
+@  stdcall glRasterPos3dv( ptr ) 
+@  stdcall glRasterPos3f( long long long ) 
+@  stdcall glRasterPos3fv( ptr ) 
+@  stdcall glRasterPos3i( long long long ) 
+@  stdcall glRasterPos3iv( ptr ) 
+@  stdcall glRasterPos3s( long long long ) 
+@  stdcall glRasterPos3sv( ptr ) 
+@  stdcall glRasterPos4d( double double double double ) 
+@  stdcall glRasterPos4dv( ptr ) 
+@  stdcall glRasterPos4f( long long long long ) 
+@  stdcall glRasterPos4fv( ptr ) 
+@  stdcall glRasterPos4i( long long long long ) 
+@  stdcall glRasterPos4iv( ptr ) 
+@  stdcall glRasterPos4s( long long long long ) 
+@  stdcall glRasterPos4sv( ptr ) 
+@  stdcall glReadBuffer( long ) 
+@  stdcall glReadPixels( long long long long long long ptr ) 
+@  stdcall glRectd( double double double double ) 
+@  stdcall glRectdv( ptr ptr ) 
+@  stdcall glRectf( long long long long ) 
+@  stdcall glRectfv( ptr ptr ) 
+@  stdcall glRecti( long long long long ) 
+@  stdcall glRectiv( ptr ptr ) 
+@  stdcall glRects( long long long long ) 
+@  stdcall glRectsv( ptr ptr ) 
+@  stdcall glRenderMode( long ) 
+#@  stdcall glResetHistogram( long ) 
+#@  stdcall glResetMinmax( long ) 
+@  stdcall glRotated( double double double double ) 
+@  stdcall glRotatef( long long long long ) 
+@  stdcall glScaled( double double double ) 
+@  stdcall glScalef( long long long ) 
+@  stdcall glScissor( long long long long ) 
+@  stdcall glSelectBuffer( long ptr ) 
+#@  stdcall glSeparableFilter2D( long long long long long long ptr ptr ) 
+@  stdcall glShadeModel( long ) 
+@  stdcall glStencilFunc( long long long ) 
+@  stdcall glStencilMask( long ) 
+@  stdcall glStencilOp( long long long ) 
+@  stdcall glTexCoord1d( double ) 
+@  stdcall glTexCoord1dv( ptr ) 
+@  stdcall glTexCoord1f( long ) 
+@  stdcall glTexCoord1fv( ptr ) 
+@  stdcall glTexCoord1i( long ) 
+@  stdcall glTexCoord1iv( ptr ) 
+@  stdcall glTexCoord1s( long ) 
+@  stdcall glTexCoord1sv( ptr ) 
+@  stdcall glTexCoord2d( double double ) 
+@  stdcall glTexCoord2dv( ptr ) 
+@  stdcall glTexCoord2f( long long ) 
+@  stdcall glTexCoord2fv( ptr ) 
+@  stdcall glTexCoord2i( long long ) 
+@  stdcall glTexCoord2iv( ptr ) 
+@  stdcall glTexCoord2s( long long ) 
+@  stdcall glTexCoord2sv( ptr ) 
+@  stdcall glTexCoord3d( double double double ) 
+@  stdcall glTexCoord3dv( ptr ) 
+@  stdcall glTexCoord3f( long long long ) 
+@  stdcall glTexCoord3fv( ptr ) 
+@  stdcall glTexCoord3i( long long long ) 
+@  stdcall glTexCoord3iv( ptr ) 
+@  stdcall glTexCoord3s( long long long ) 
+@  stdcall glTexCoord3sv( ptr ) 
+@  stdcall glTexCoord4d( double double double double ) 
+@  stdcall glTexCoord4dv( ptr ) 
+@  stdcall glTexCoord4f( long long long long ) 
+@  stdcall glTexCoord4fv( ptr ) 
+@  stdcall glTexCoord4i( long long long long ) 
+@  stdcall glTexCoord4iv( ptr ) 
+@  stdcall glTexCoord4s( long long long long ) 
+@  stdcall glTexCoord4sv( ptr ) 
+@  stdcall glTexCoordPointer( long long long ptr ) 
+@  stdcall glTexEnvf( long long long ) 
+@  stdcall glTexEnvfv( long long ptr ) 
+@  stdcall glTexEnvi( long long long ) 
+@  stdcall glTexEnviv( long long ptr ) 
+@  stdcall glTexGend( long long double ) 
+@  stdcall glTexGendv( long long ptr ) 
+@  stdcall glTexGenf( long long long ) 
+@  stdcall glTexGenfv( long long ptr ) 
+@  stdcall glTexGeni( long long long ) 
+@  stdcall glTexGeniv( long long ptr ) 
+@  stdcall glTexImage1D( long long long long long long long ptr ) 
+@  stdcall glTexImage2D( long long long long long long long long ptr ) 
+#@  stdcall glTexImage3D( long long long long long long long long long ptr ) 
+@  stdcall glTexParameterf( long long long ) 
+@  stdcall glTexParameterfv( long long ptr ) 
+@  stdcall glTexParameteri( long long long ) 
+@  stdcall glTexParameteriv( long long ptr ) 
+@  stdcall glTexSubImage1D( long long long long long long ptr ) 
+@  stdcall glTexSubImage2D( long long long long long long long long ptr ) 
+#@  stdcall glTexSubImage3D( long long long long long long long long long long ptr ) 
+@  stdcall glTranslated( double double double ) 
+@  stdcall glTranslatef( long long long ) 
+@  stdcall glVertex2d( double double ) 
+@  stdcall glVertex2dv( ptr ) 
+@  stdcall glVertex2f( long long ) 
+@  stdcall glVertex2fv( ptr ) 
+@  stdcall glVertex2i( long long ) 
+@  stdcall glVertex2iv( ptr ) 
+@  stdcall glVertex2s( long long ) 
+@  stdcall glVertex2sv( ptr ) 
+@  stdcall glVertex3d( double double double ) 
+@  stdcall glVertex3dv( ptr ) 
+@  stdcall glVertex3f( long long long ) 
+@  stdcall glVertex3fv( ptr ) 
+@  stdcall glVertex3i( long long long ) 
+@  stdcall glVertex3iv( ptr ) 
+@  stdcall glVertex3s( long long long ) 
+@  stdcall glVertex3sv( ptr ) 
+@  stdcall glVertex4d( double double double double ) 
+@  stdcall glVertex4dv( ptr ) 
+@  stdcall glVertex4f( long long long long ) 
+@  stdcall glVertex4fv( ptr ) 
+@  stdcall glVertex4i( long long long long ) 
+@  stdcall glVertex4iv( ptr ) 
+@  stdcall glVertex4s( long long long long ) 
+@  stdcall glVertex4sv( ptr ) 
+@  stdcall glVertexPointer( long long long ptr ) 
+@  stdcall glViewport( long long long long ) 
 
-glAccum@8
-glAlphaFunc@8
-glAreTexturesResident@12
-glArrayElement@4
-glBegin@4
-glBindTexture@8
-glBitmap@28
-glBlendFunc@8
-glCallList@4
-glCallLists@12
-glClear@4
-glClearAccum@16
-glClearColor@16
-glClearDepth@8
-glClearIndex@4
-glClearStencil@4
-glClipPlane@8
-
-glColor3b@12
-glColor3bv@4
-glColor3d@24
-glColor3dv@4
-glColor3f@12
-glColor3fv@4
-glColor3i@12
-glColor3iv@4
-glColor3s@12
-glColor3sv@4
-glColor3ub@12
-glColor3ubv@4
-glColor3ui@12
-glColor3uiv@4
-glColor3us@12
-glColor3usv@4
-
-glColor4b@16
-glColor4bv@4
-glColor4d@32
-glColor4dv@4
-glColor4f@16
-glColor4fv@4
-glColor4i@16
-glColor4iv@4
-glColor4s@16
-glColor4sv@4
-glColor4ub@16
-glColor4ubv@4
-glColor4ui@16
-glColor4uiv@4
-glColor4us@16
-glColor4usv@4
-
-glColorMask@16
-glColorMaterial@8
-glColorPointer@16
-glCopyPixels@20
-glCopyTexImage1D@28
-glCopyTexImage2D@32
-glCopyTexSubImage1D@24
-glCopyTexSubImage2D@32
-glCullFace@4
-;glDebugEntry
-glDeleteLists@8
-glDeleteTextures@8
-glDepthFunc@4
-glDepthMask@4
-glDepthRange@16
-glDisable@4
-glDisableClientState@4
-glDrawArrays@12
-glDrawBuffer@4
-glDrawElements@16
-glDrawPixels@20
-glEdgeFlag@4
-glEdgeFlagPointer@8
-glEdgeFlagv@4
-glEnable@4
-glEnableClientState@4
-glEnd@0
-glEndList@0
-
-glEvalCoord1d@8
-glEvalCoord1dv@4
-glEvalCoord1f@4
-glEvalCoord1fv@4
-glEvalCoord2d@16
-glEvalCoord2dv@4
-glEvalCoord2f@8
-glEvalCoord2fv@4
-
-glEvalMesh1@12
-glEvalMesh2@20
-glEvalPoint1@4
-glEvalPoint2@8
-glFeedbackBuffer@12
-glFinish@0
-glFlush@0
-glFogf@8
-glFogfv@8
-glFogi@8
-glFogiv@8
-glFrontFace@4
-glFrustum@48
-glGenLists@4
-glGenTextures@8
-glGetBooleanv@8
-glGetClipPlane@8
-glGetDoublev@8
-glGetError@0
-glGetFloatv@8
-glGetIntegerv@8
-glGetLightfv@12
-glGetLightiv@12
-glGetMapdv@12
-glGetMapfv@12
-glGetMapiv@12
-glGetMaterialfv@12
-glGetMaterialiv@12
-glGetPixelMapfv@8
-glGetPixelMapuiv@8
-glGetPixelMapusv@8
-glGetPointerv@8
-glGetPolygonStipple@4
-glGetString@4
-glGetTexEnvfv@12
-glGetTexEnviv@12
-glGetTexGendv@12
-glGetTexGenfv@12
-glGetTexGeniv@12
-glGetTexImage@20
-glGetTexLevelParameterfv@16
-glGetTexLevelParameteriv@16
-glGetTexParameterfv@12
-glGetTexParameteriv@12
-glHint@8
-glIndexd@8
-glIndexdv@4
-glIndexf@4
-glIndexfv@4
-glIndexi@4
-glIndexiv@4
-glIndexMask@4
-glIndexPointer@12
-glIndexs@4
-glIndexsv@4
-glIndexub@4
-glIndexubv@4
-glInitNames@0
-glInterleavedArrays@12
-glIsEnabled@4
-glIsList@4
-glIsTexture@4
-
-glLightf@12
-glLightfv@12
-glLighti@12
-glLightiv@12
-glLightModelf@8
-glLightModelfv@8
-glLightModeli@8
-glLightModeliv@8
-
-glLineStipple@8
-glLineWidth@4
-glListBase@4
-glLoadIdentity@0
-glLoadMatrixd@4
-glLoadMatrixf@4
-glLoadName@4
-glLogicOp@4
-
-glMap1d@32
-glMap1f@24
-glMap2d@56
-glMap2f@40
-glMapGrid1d@20
-glMapGrid1f@12
-glMapGrid2d@40
-glMapGrid2f@24
-
-glMaterialf@12
-glMaterialfv@12
-glMateriali@12
-glMaterialiv@12
-
-glMatrixMode@4
-;GlmfBeginGlsBlock
-;GlmfCloseMetaFile
-;GlmfEndGlsBlock
-;GlmfEndPlayback
-;GlmfInitPlayback
-;GlmfPlayGlsRecord
-glMultMatrixd@4
-glMultMatrixf@4
-glNewList@8
-
-glNormal3b@12
-glNormal3bv@4
-glNormal3d@24
-glNormal3dv@4
-glNormal3f@12
-glNormal3fv@4
-glNormal3i@12
-glNormal3iv@4
-glNormal3s@12
-glNormal3sv@4
-glNormalPointer@12
-
-glOrtho@48
-glPassThrough@4
-glPixelMapfv@12
-glPixelMapuiv@12
-glPixelMapusv@12
-glPixelStoref@8
-glPixelStorei@8
-glPixelTransferf@8
-glPixelTransferi@8
-glPixelZoom@8
-glPointSize@4
-glPolygonMode@8
-glPolygonOffset@8
-glPolygonStipple@4
-glPopAttrib@0
-glPopClientAttrib@0
-glPopMatrix@0
-glPopName@0
-glPrioritizeTextures@12
-glPushAttrib@4
-glPushClientAttrib@4
-glPushMatrix@0
-glPushName@4
-glRasterPos2d@16
-glRasterPos2dv@4
-glRasterPos2f@8
-glRasterPos2fv@4
-glRasterPos2i@8
-glRasterPos2iv@4
-glRasterPos2s@8
-glRasterPos2sv@4
-glRasterPos3d@24
-glRasterPos3dv@4
-glRasterPos3f@12
-glRasterPos3fv@4
-glRasterPos3i@12
-glRasterPos3iv@4
-glRasterPos3s@12
-glRasterPos3sv@4
-glRasterPos4d@32
-glRasterPos4dv@4
-glRasterPos4f@16
-glRasterPos4fv@4
-glRasterPos4i@16
-glRasterPos4iv@4
-glRasterPos4s@16
-glRasterPos4sv@4
-glReadBuffer@4
-glReadPixels@28
-glRectd@32
-glRectdv@8
-glRectf@16
-glRectfv@8
-glRecti@16
-glRectiv@8
-glRects@16
-glRectsv@8
-glRenderMode@4
-glRotated@32
-glRotatef@16
-glScaled@24
-glScalef@12
-glScissor@16
-glSelectBuffer@8
-glShadeModel@4
-glStencilFunc@12
-glStencilMask@4
-glStencilOp@12
-
-glTexCoord1d@8
-glTexCoord1dv@4
-glTexCoord1f@4
-glTexCoord1fv@4
-glTexCoord1i@4
-glTexCoord1iv@4
-glTexCoord1s@4
-glTexCoord1sv@4
-
-glTexCoord2d@16
-glTexCoord2dv@4
-glTexCoord2f@8
-glTexCoord2fv@4
-glTexCoord2i@8
-glTexCoord2iv@4
-glTexCoord2s@8
-glTexCoord2sv@4
-
-glTexCoord3d@24
-glTexCoord3dv@4
-glTexCoord3f@12
-glTexCoord3fv@4
-glTexCoord3i@12
-glTexCoord3iv@4
-glTexCoord3s@12
-glTexCoord3sv@4
-
-glTexCoord4d@32
-glTexCoord4dv@4
-glTexCoord4f@16
-glTexCoord4fv@4
-glTexCoord4i@16
-glTexCoord4iv@4
-glTexCoord4s@16
-glTexCoord4sv@4
-
-glTexCoordPointer@16
-glTexEnvf@12
-glTexEnvfv@12
-glTexEnvi@12
-glTexEnviv@12
-glTexGend@16
-glTexGendv@12
-glTexGenf@12
-glTexGenfv@12
-glTexGeni@12
-glTexGeniv@12
-glTexImage1D@32
-glTexImage2D@36
-glTexParameterf@12
-glTexParameterfv@12
-glTexParameteri@12
-glTexParameteriv@12
-glTexSubImage1D@28
-glTexSubImage2D@36
-
-glTranslated@24
-glTranslatef@12
-
-glVertex2d@16
-glVertex2dv@4
-glVertex2f@8
-glVertex2fv@4
-glVertex2i@8
-glVertex2iv@4
-glVertex2s@8
-glVertex2sv@4
-
-glVertex3d@24
-glVertex3dv@4
-glVertex3f@12
-glVertex3fv@4
-glVertex3i@12
-glVertex3iv@4
-glVertex3s@12
-glVertex3sv@4
-
-glVertex4d@32
-glVertex4dv@4
-glVertex4f@16
-glVertex4fv@4
-glVertex4i@16
-glVertex4iv@4
-glVertex4s@16
-glVertex4sv@4
-
-glVertexPointer@16
-glViewport@16
-
-wglChoosePixelFormat@8=rosglChoosePixelFormat@8
-wglCopyContext@12=rosglCopyContext@12
-wglCreateContext@4=rosglCreateContext@4
-wglCreateLayerContext@8=rosglCreateLayerContext@8
-wglDeleteContext@4=rosglDeleteContext@4
-wglDescribeLayerPlane@20=rosglDescribeLayerPlane@20
-wglDescribePixelFormat@16=rosglDescribePixelFormat@16
-wglGetCurrentContext@0=rosglGetCurrentContext@0
-wglGetCurrentDC@0=rosglGetCurrentDC@0
-wglGetDefaultProcAddress@4=rosglGetDefaultProcAddress@4
-wglGetLayerPaletteEntries@20=rosglGetLayerPaletteEntries@20
-wglGetPixelFormat@4=rosglGetPixelFormat@4
-wglGetProcAddress@4=rosglGetProcAddress@4
-wglMakeCurrent@8=rosglMakeCurrent@8
-wglRealizeLayerPalette@12=rosglRealizeLayerPalette@12
-wglSetLayerPaletteEntries@20=rosglSetLayerPaletteEntries@20
-wglSetPixelFormat@12=rosglSetPixelFormat@12
-wglShareLists@8=rosglShareLists@8
-wglSwapBuffers@4=rosglSwapBuffers@4
-wglSwapLayerBuffers@8=rosglSwapLayerBuffers@8
-;wglSwapMultipleBuffers=rosglSwapMultipleBuffers@
-wglUseFontBitmapsA@16=rosglUseFontBitmapsA@16
-wglUseFontBitmapsW@16=rosglUseFontBitmapsW@16
-wglUseFontOutlinesA@32=rosglUseFontOutlinesA@32
-wglUseFontOutlinesW@32=rosglUseFontOutlinesW@32
+@  stdcall wglChoosePixelFormat(long ptr) rosglChoosePixelFormat
+@  stdcall wglCopyContext(long long long) rosglCopyContext
+@  stdcall wglCreateContext(long) rosglCreateContext
+@  stdcall wglCreateLayerContext(long long) rosglCreateLayerContext
+@  stdcall wglDeleteContext(long) rosglDeleteContext
+@  stdcall wglDescribeLayerPlane(long long long long ptr) rosglDescribeLayerPlane
+@  stdcall wglDescribePixelFormat(long long long ptr) rosglDescribePixelFormat
+@  stdcall wglGetCurrentContext() rosglGetCurrentContext
+@  stdcall wglGetCurrentDC() rosglGetCurrentDC
+@  stdcall wglGetDefaultProcAddress(ptr) rosglGetDefaultProcAddress
+@  stdcall wglGetLayerPaletteEntries(long long long long ptr)
rosglGetLayerPaletteEntries
+@  stdcall wglGetPixelFormat(long) rosglGetPixelFormat
+@  stdcall wglGetProcAddress(str) rosglGetProcAddress
+@  stdcall wglMakeCurrent(long long) rosglMakeCurrent
+@  stdcall wglRealizeLayerPalette(long long long) rosglRealizeLayerPalette
+@  stdcall wglSetLayerPaletteEntries(long long long long ptr)
rosglSetLayerPaletteEntries
+@  stdcall wglSetPixelFormat(long long ptr) rosglSetPixelFormat
+@  stdcall wglShareLists(long long) rosglShareLists
+@  stdcall wglSwapBuffers(long) rosglSwapBuffers
+@  stdcall wglSwapLayerBuffers(long long) rosglSwapLayerBuffers
+@  stdcall wglUseFontBitmapsA(long long long long) rosglUseFontBitmapsA
+@  stdcall wglUseFontBitmapsW(long long long long) rosglUseFontBitmapsW
+@  stdcall wglUseFontOutlinesA(long long long long long long long ptr)
rosglUseFontOutlinesA
+@  stdcall wglUseFontOutlinesW(long long long long long long long ptr)
rosglUseFontOutlinesW

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

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

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