Removed some more trailing whitespace.
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 58e67a8..8874565 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -68,21 +68,21 @@
#
# List of categories to put in the 'opengl_norm.c' file
#
-%cat_1_0 = ( "display-list" => 1,
- "drawing" => 1,
- "drawing-control" => 1,
- "feedback" => 1,
- "framebuf" => 1,
- "misc" => 1,
- "modeling" => 1,
- "pixel-op" => 1,
- "pixel-rw" => 1,
- "state-req" => 1,
+%cat_1_0 = ( "display-list" => 1,
+ "drawing" => 1,
+ "drawing-control" => 1,
+ "feedback" => 1,
+ "framebuf" => 1,
+ "misc" => 1,
+ "modeling" => 1,
+ "pixel-op" => 1,
+ "pixel-rw" => 1,
+ "state-req" => 1,
"xform" => 1 );
-%cat_1_1 = ( %cat_1_0,
+%cat_1_1 = ( %cat_1_0,
"1_1" => 1 );
-%cat_1_2 = ( %cat_1_1,
- "VERSION_1_2" => 1,
+%cat_1_2 = ( %cat_1_1,
+ "VERSION_1_2" => 1,
"ARB_multitexture" => 1 );
%norm_categories = ();
@@ -91,7 +91,7 @@
# This hash table gives the conversion between OpenGL types and what
# is used by the TRACE printfs
#
-%debug_conv =
+%debug_conv =
("GLbitfield" => "%d",
"GLboolean" => "%d",
"GLbyte" => "%d",
@@ -114,7 +114,7 @@
# This hash table gives the conversion between OpenGL types and what
# is used in the .spec file
#
-%arg_conv =
+%arg_conv =
("GLbitfield" => [ "long", 4 ],
"GLboolean" => [ "long", 4 ],
"GLbyte" => [ "long", 4 ],
@@ -280,110 +280,110 @@
# [ "GLubyte *", "bitmap"] ] ];
#
%norm_functions = ();
-%ext_functions =
+%ext_functions =
( "glMTexCoord2fSGIS" => [ "glMTexCoord2fSGIS", "void", [ [ "GLenum", "target" ],
[ "GLfloat", "s" ],
[ "GLfloat", "t" ] ], "glMTexCoord2fSGIS" ],
- "glMTexCoord2fvSGIS" => [ "glMTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMTexCoord2fvSGIS" => [ "glMTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLfloat *", "v" ] ], "glMTexCoord2fvSGIS" ],
- "glMultiTexCoord1dSGIS" => [ "glMultiTexCoord1dSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1dSGIS" => [ "glMultiTexCoord1dSGIS", "void", [ [ "GLenum", "target" ],
[ "GLdouble", "s" ] ], "glMultiTexCoord1dSGIS" ],
- "glMultiTexCoord1dvSGIS" => [ "glMultiTexCoord1dvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1dvSGIS" => [ "glMultiTexCoord1dvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLdouble *", "v" ] ], "glMultiTexCoord1dvSGIS" ],
- "glMultiTexCoord1fSGIS" => [ "glMultiTexCoord1fSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1fSGIS" => [ "glMultiTexCoord1fSGIS", "void", [ [ "GLenum", "target" ],
[ "GLfloat", "s" ] ], "glMultiTexCoord1fSGIS" ],
- "glMultiTexCoord1fvSGIS" => [ "glMultiTexCoord1fvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1fvSGIS" => [ "glMultiTexCoord1fvSGIS", "void", [ [ "GLenum", "target" ],
[ "const GLfloat *", "v" ] ], "glMultiTexCoord1fvSGIS" ],
- "glMultiTexCoord1iSGIS" => [ "glMultiTexCoord1iSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1iSGIS" => [ "glMultiTexCoord1iSGIS", "void", [ [ "GLenum", "target" ],
[ "GLint", "s" ] ], "glMultiTexCoord1iSGIS" ],
- "glMultiTexCoord1ivSGIS" => [ "glMultiTexCoord1ivSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1ivSGIS" => [ "glMultiTexCoord1ivSGIS", "void", [ [ "GLenum", "target" ],
[ "GLint *", "v" ] ], "glMultiTexCoord1ivSGIS" ],
- "glMultiTexCoord1sSGIS" => [ "glMultiTexCoord1sSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1sSGIS" => [ "glMultiTexCoord1sSGIS", "void", [ [ "GLenum", "target" ],
[ "GLshort", "s" ] ], "glMultiTexCoord1sSGIS" ],
- "glMultiTexCoord1svSGIS" => [ "glMultiTexCoord1svSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord1svSGIS" => [ "glMultiTexCoord1svSGIS", "void", [ [ "GLenum", "target" ],
[ "GLshort *", "v" ] ], "glMultiTexCoord1svSGIS" ],
- "glMultiTexCoord2dSGIS" => [ "glMultiTexCoord2dSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLdouble", "s"],
+ "glMultiTexCoord2dSGIS" => [ "glMultiTexCoord2dSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLdouble", "s"],
[ "GLdouble", "t" ] ], "glMultiTexCoord2dSGIS" ],
- "glMultiTexCoord2dvSGIS" => [ "glMultiTexCoord2dvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord2dvSGIS" => [ "glMultiTexCoord2dvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLdouble *", "v" ] ], "glMultiTexCoord2dvSGIS" ],
- "glMultiTexCoord2fSGIS" => [ "glMultiTexCoord2fSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLfloat", "s" ],
+ "glMultiTexCoord2fSGIS" => [ "glMultiTexCoord2fSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLfloat", "s" ],
[ "GLfloat", "t" ] ], "glMultiTexCoord2fSGIS" ],
- "glMultiTexCoord2fvSGIS" => [ "glMultiTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord2fvSGIS" => [ "glMultiTexCoord2fvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLfloat *", "v" ] ], "glMultiTexCoord2fvSGIS" ],
- "glMultiTexCoord2iSGIS" => [ "glMultiTexCoord2iSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLint", "s" ],
+ "glMultiTexCoord2iSGIS" => [ "glMultiTexCoord2iSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLint", "s" ],
[ "GLint", "t" ] ], "glMultiTexCoord2iSGIS" ],
- "glMultiTexCoord2ivSGIS" => [ "glMultiTexCoord2ivSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord2ivSGIS" => [ "glMultiTexCoord2ivSGIS", "void", [ [ "GLenum", "target" ],
[ "GLint *", "v" ] ], "glMultiTexCoord2ivSGIS" ],
- "glMultiTexCoord2sSGIS" => [ "glMultiTexCoord2sSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLshort", "s" ],
+ "glMultiTexCoord2sSGIS" => [ "glMultiTexCoord2sSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLshort", "s" ],
[ "GLshort", "t" ] ], "glMultiTexCoord2sSGIS" ],
- "glMultiTexCoord2svSGIS" => [ "glMultiTexCoord2svSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord2svSGIS" => [ "glMultiTexCoord2svSGIS", "void", [ [ "GLenum", "target" ],
[ "GLshort *", "v" ] ], "glMultiTexCoord2svSGIS" ],
- "glMultiTexCoord3dSGIS" => [ "glMultiTexCoord3dSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLdouble", "s" ],
- [ "GLdouble", "t" ],
+ "glMultiTexCoord3dSGIS" => [ "glMultiTexCoord3dSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLdouble", "s" ],
+ [ "GLdouble", "t" ],
[ "GLdouble", "r" ] ], "glMultiTexCoord3dSGIS" ],
"glMultiTexCoord3dvSGIS" => [ "glMultiTexCoord3dvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLdouble *", "v" ] ], "glMultiTexCoord3dvSGIS" ],
- "glMultiTexCoord3fSGIS" => [ "glMultiTexCoord3fSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLfloat", "s" ],
- [ "GLfloat", "t" ],
+ "glMultiTexCoord3fSGIS" => [ "glMultiTexCoord3fSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLfloat", "s" ],
+ [ "GLfloat", "t" ],
[ "GLfloat", "r" ] ], "glMultiTexCoord3fSGIS" ],
- "glMultiTexCoord3fvSGIS" => [ "glMultiTexCoord3fvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord3fvSGIS" => [ "glMultiTexCoord3fvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLfloat *", "v" ] ], "glMultiTexCoord3fvSGIS" ],
- "glMultiTexCoord3iSGIS" => [ "glMultiTexCoord3iSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLint", "s" ],
- [ "GLint", "t" ],
+ "glMultiTexCoord3iSGIS" => [ "glMultiTexCoord3iSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLint", "s" ],
+ [ "GLint", "t" ],
[ "GLint", "r" ] ], "glMultiTexCoord3iSGIS" ],
- "glMultiTexCoord3ivSGIS" => [ "glMultiTexCoord3ivSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord3ivSGIS" => [ "glMultiTexCoord3ivSGIS", "void", [ [ "GLenum", "target" ],
[ "GLint *", "v" ] ], "glMultiTexCoord3ivSGIS" ],
- "glMultiTexCoord3sSGIS" => [ "glMultiTexCoord3sSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLshort", "s" ],
- [ "GLshort", "t" ],
+ "glMultiTexCoord3sSGIS" => [ "glMultiTexCoord3sSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLshort", "s" ],
+ [ "GLshort", "t" ],
[ "GLshort", "r" ] ], "glMultiTexCoord3sSGIS" ],
- "glMultiTexCoord3svSGIS" => [ "glMultiTexCoord3svSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord3svSGIS" => [ "glMultiTexCoord3svSGIS", "void", [ [ "GLenum", "target" ],
[ "GLshort *", "v" ] ], "glMultiTexCoord3svSGIS" ],
- "glMultiTexCoord4dSGIS" => [ "glMultiTexCoord4dSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLdouble", "s" ],
- [ "GLdouble", "t" ],
- [ "GLdouble", "r" ],
+ "glMultiTexCoord4dSGIS" => [ "glMultiTexCoord4dSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLdouble", "s" ],
+ [ "GLdouble", "t" ],
+ [ "GLdouble", "r" ],
[ "GLdouble", "q" ] ], "glMultiTexCoord4dSGIS" ],
- "glMultiTexCoord4dvSGIS" => [ "glMultiTexCoord4dvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord4dvSGIS" => [ "glMultiTexCoord4dvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLdouble *", "v" ] ], "glMultiTexCoord4dvSGIS" ],
- "glMultiTexCoord4fSGIS" => [ "glMultiTexCoord4fSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLfloat", "s" ],
- [ "GLfloat", "t" ],
- [ "GLfloat", "r" ],
+ "glMultiTexCoord4fSGIS" => [ "glMultiTexCoord4fSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLfloat", "s" ],
+ [ "GLfloat", "t" ],
+ [ "GLfloat", "r" ],
[ "GLfloat", "q" ] ], "glMultiTexCoord4fSGIS" ],
- "glMultiTexCoord4fvSGIS" => [ "glMultiTexCoord4fvSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord4fvSGIS" => [ "glMultiTexCoord4fvSGIS", "void", [ [ "GLenum", "target" ],
[ "GLfloat *", "v" ] ], "glMultiTexCoord4fvSGIS" ],
- "glMultiTexCoord4iSGIS" => [ "glMultiTexCoord4iSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLint", "s" ],
- [ "GLint", "t" ],
- [ "GLint", "r" ],
+ "glMultiTexCoord4iSGIS" => [ "glMultiTexCoord4iSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLint", "s" ],
+ [ "GLint", "t" ],
+ [ "GLint", "r" ],
[ "GLint", "q" ] ], "glMultiTexCoord4iSGIS" ],
- "glMultiTexCoord4ivSGIS" => [ "glMultiTexCoord4ivSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord4ivSGIS" => [ "glMultiTexCoord4ivSGIS", "void", [ [ "GLenum", "target" ],
[ "GLint *", "v" ] ], "glMultiTexCoord4ivSGIS" ],
- "glMultiTexCoord4sSGIS" => [ "glMultiTexCoord4sSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLshort", "s" ],
- [ "GLshort", "t" ],
- [ "GLshort", "r" ],
+ "glMultiTexCoord4sSGIS" => [ "glMultiTexCoord4sSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLshort", "s" ],
+ [ "GLshort", "t" ],
+ [ "GLshort", "r" ],
[ "GLshort", "q" ] ], "glMultiTexCoord4sSGIS" ],
- "glMultiTexCoord4svSGIS" => [ "glMultiTexCoord4svSGIS", "void", [ [ "GLenum", "target" ],
+ "glMultiTexCoord4svSGIS" => [ "glMultiTexCoord4svSGIS", "void", [ [ "GLenum", "target" ],
[ "GLshort *", "v" ] ], "glMultiTexCoord4svSGIS" ],
- "glMultiTexCoordPointerSGIS" => [ "glMultiTexCoordPointerSGIS", "void", [ [ "GLenum", "target" ],
- [ "GLint", "size" ],
+ "glMultiTexCoordPointerSGIS" => [ "glMultiTexCoordPointerSGIS", "void", [ [ "GLenum", "target" ],
+ [ "GLint", "size" ],
[ "GLenum", "type" ],
- [ "GLsizei", "stride" ],
+ [ "GLsizei", "stride" ],
[ "GLvoid *", "pointer" ] ], "glMultiTexCoordPointerSGIS" ],
"glSelectTextureSGIS" => [ "glSelectTextureSGIS", "void", [ [ "GLenum", "target" ] ], "glSelectTextureSGIS" ],
"glSelectTextureCoordSetSGIS" => [ "glSelectTextureCoordSetSGIS", "void", [ [ "GLenum", "target" ] ], "glSelectTextureCoordSetSGIS" ],
"wglAllocateMemoryNV" => [ "wglAllocateMemoryNV", "void *", [ [ "GLsizei", "size" ],
[ "GLfloat", "readfreq" ],
- [ "GLfloat", "writefreq"],
+ [ "GLfloat", "writefreq"],
[ "GLfloat", "priority" ] ], "glXAllocateMemoryNV" ],
"wglFreeMemoryNV" => [ "wglFreeMemoryNV", "void", [ [ "GLvoid *", "pointer" ] ], "glXFreeMemoryNV" ]
);
@@ -395,7 +395,7 @@
($funcname, $args) = ($line =~ /^(\w*)\((.*)\)/);
# and the argument names
@arg_names = split /\s*,\s*/, $args;
-
+
# After get :
# - the return type
# - the argument types
@@ -423,7 +423,7 @@
} elsif ($line =~ /^\t*param/) {
($name, $base_type, $ext) = ($line =~ /\t*param\s*(\w*)\s*(\w*) (.*)/);
$ptr = 0;
- unless (defined($name)) {
+ unless (defined($name)) {
chomp $line;
die "Broken spec file line $line in function $funcname\n";
}
@@ -447,7 +447,7 @@
if ($ptr) {
$type = $type . "*";
}
-
+
$arg_types{$name} = $type;
}
}
@@ -462,14 +462,14 @@
}
die "Undefined type for $arg_names[$i] in function $funcname\n";
}
-
+
push @$arg_ref, [ $arg_types{$arg_names[$i]}, $arg_names[$i] ];
}
- $func_ref = [ "gl" . $funcname,
+ $func_ref = [ "gl" . $funcname,
$ret_type,
$arg_ref,
"gl" . $funcname ];
-
+
# Now, put in one or the other hash table
if ($norm_categories{$category}) {
$norm_functions{"gl" . $funcname} = $func_ref;
