Commit 2510658d authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

Now generating argument-less functions as (void) instead of ().

parent 1f7a8d6a
...@@ -238,6 +238,7 @@ sub GenerateThunk($$$$) ...@@ -238,6 +238,7 @@ sub GenerateThunk($$$$)
$call_arg = "$call_arg "; $call_arg = "$call_arg ";
} }
} }
$ret .= 'void ' if ($#{@{$func_ref->[2]}} < 0);
$ret = "$ret) {\n"; $ret = "$ret) {\n";
if ($func_ref->[1] ne "void") { if ($func_ref->[1] ne "void") {
$ret = "$ret " . ConvertType($func_ref->[1]) . " ret_value;\n"; $ret = "$ret " . ConvertType($func_ref->[1]) . " ret_value;\n";
...@@ -689,6 +690,7 @@ foreach (sort keys %ext_functions) { ...@@ -689,6 +690,7 @@ foreach (sort keys %ext_functions) {
print EXT " "; print EXT " ";
} }
} }
print EXT 'void ' if ($#{@{$func_ref->[2]}} < 0);
print EXT ") = (void *) 0xdeadbeef;\n"; print EXT ") = (void *) 0xdeadbeef;\n";
} }
...@@ -706,6 +708,7 @@ foreach (sort keys %ext_functions) { ...@@ -706,6 +708,7 @@ foreach (sort keys %ext_functions) {
print EXT " "; print EXT " ";
} }
} }
print EXT 'void ' if ($#{@{$func_ref->[2]}} < 0);
print EXT ");\n"; print EXT ");\n";
} }
......
...@@ -932,7 +932,7 @@ void WINAPI wine_glEnableClientState( GLenum array ) { ...@@ -932,7 +932,7 @@ void WINAPI wine_glEnableClientState( GLenum array ) {
/*********************************************************************** /***********************************************************************
* glEnd (OPENGL32.@) * glEnd (OPENGL32.@)
*/ */
void WINAPI wine_glEnd( ) { void WINAPI wine_glEnd( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glEnd( ); glEnd( );
...@@ -942,7 +942,7 @@ void WINAPI wine_glEnd( ) { ...@@ -942,7 +942,7 @@ void WINAPI wine_glEnd( ) {
/*********************************************************************** /***********************************************************************
* glEndList (OPENGL32.@) * glEndList (OPENGL32.@)
*/ */
void WINAPI wine_glEndList( ) { void WINAPI wine_glEndList( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glEndList( ); glEndList( );
...@@ -1082,7 +1082,7 @@ void WINAPI wine_glFeedbackBuffer( GLsizei size, GLenum type, GLfloat* buffer ) ...@@ -1082,7 +1082,7 @@ void WINAPI wine_glFeedbackBuffer( GLsizei size, GLenum type, GLfloat* buffer )
/*********************************************************************** /***********************************************************************
* glFinish (OPENGL32.@) * glFinish (OPENGL32.@)
*/ */
void WINAPI wine_glFinish( ) { void WINAPI wine_glFinish( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glFinish( ); glFinish( );
...@@ -1092,7 +1092,7 @@ void WINAPI wine_glFinish( ) { ...@@ -1092,7 +1092,7 @@ void WINAPI wine_glFinish( ) {
/*********************************************************************** /***********************************************************************
* glFlush (OPENGL32.@) * glFlush (OPENGL32.@)
*/ */
void WINAPI wine_glFlush( ) { void WINAPI wine_glFlush( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glFlush( ); glFlush( );
...@@ -1274,7 +1274,7 @@ void WINAPI wine_glGetDoublev( GLenum pname, GLdouble* params ) { ...@@ -1274,7 +1274,7 @@ void WINAPI wine_glGetDoublev( GLenum pname, GLdouble* params ) {
/*********************************************************************** /***********************************************************************
* glGetError (OPENGL32.@) * glGetError (OPENGL32.@)
*/ */
GLenum WINAPI wine_glGetError( ) { GLenum WINAPI wine_glGetError( void ) {
GLenum ret_value; GLenum ret_value;
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
...@@ -1748,7 +1748,7 @@ void WINAPI wine_glIndexubv( GLubyte* c ) { ...@@ -1748,7 +1748,7 @@ void WINAPI wine_glIndexubv( GLubyte* c ) {
/*********************************************************************** /***********************************************************************
* glInitNames (OPENGL32.@) * glInitNames (OPENGL32.@)
*/ */
void WINAPI wine_glInitNames( ) { void WINAPI wine_glInitNames( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glInitNames( ); glInitNames( );
...@@ -1914,7 +1914,7 @@ void WINAPI wine_glListBase( GLuint base ) { ...@@ -1914,7 +1914,7 @@ void WINAPI wine_glListBase( GLuint base ) {
/*********************************************************************** /***********************************************************************
* glLoadIdentity (OPENGL32.@) * glLoadIdentity (OPENGL32.@)
*/ */
void WINAPI wine_glLoadIdentity( ) { void WINAPI wine_glLoadIdentity( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glLoadIdentity( ); glLoadIdentity( );
...@@ -2384,7 +2384,7 @@ void WINAPI wine_glPolygonStipple( GLubyte* mask ) { ...@@ -2384,7 +2384,7 @@ void WINAPI wine_glPolygonStipple( GLubyte* mask ) {
/*********************************************************************** /***********************************************************************
* glPopAttrib (OPENGL32.@) * glPopAttrib (OPENGL32.@)
*/ */
void WINAPI wine_glPopAttrib( ) { void WINAPI wine_glPopAttrib( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glPopAttrib( ); glPopAttrib( );
...@@ -2394,7 +2394,7 @@ void WINAPI wine_glPopAttrib( ) { ...@@ -2394,7 +2394,7 @@ void WINAPI wine_glPopAttrib( ) {
/*********************************************************************** /***********************************************************************
* glPopClientAttrib (OPENGL32.@) * glPopClientAttrib (OPENGL32.@)
*/ */
void WINAPI wine_glPopClientAttrib( ) { void WINAPI wine_glPopClientAttrib( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glPopClientAttrib( ); glPopClientAttrib( );
...@@ -2404,7 +2404,7 @@ void WINAPI wine_glPopClientAttrib( ) { ...@@ -2404,7 +2404,7 @@ void WINAPI wine_glPopClientAttrib( ) {
/*********************************************************************** /***********************************************************************
* glPopMatrix (OPENGL32.@) * glPopMatrix (OPENGL32.@)
*/ */
void WINAPI wine_glPopMatrix( ) { void WINAPI wine_glPopMatrix( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glPopMatrix( ); glPopMatrix( );
...@@ -2414,7 +2414,7 @@ void WINAPI wine_glPopMatrix( ) { ...@@ -2414,7 +2414,7 @@ void WINAPI wine_glPopMatrix( ) {
/*********************************************************************** /***********************************************************************
* glPopName (OPENGL32.@) * glPopName (OPENGL32.@)
*/ */
void WINAPI wine_glPopName( ) { void WINAPI wine_glPopName( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glPopName( ); glPopName( );
...@@ -2454,7 +2454,7 @@ void WINAPI wine_glPushClientAttrib( GLbitfield mask ) { ...@@ -2454,7 +2454,7 @@ void WINAPI wine_glPushClientAttrib( GLbitfield mask ) {
/*********************************************************************** /***********************************************************************
* glPushMatrix (OPENGL32.@) * glPushMatrix (OPENGL32.@)
*/ */
void WINAPI wine_glPushMatrix( ) { void WINAPI wine_glPushMatrix( void ) {
TRACE("()\n"); TRACE("()\n");
ENTER_GL(); ENTER_GL();
glPushMatrix( ); glPushMatrix( );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment