glu32: fix some of -Wmissing-declarations warinings
Stefan Huehner
stefan at huehner.org
Sat Jul 23 11:06:39 CDT 2005
Hi,
this patch creates a new header local too the glu32.dll which contains
the prototypes for the functions from glu.c which are prefixed with
'wine_'. Additionally some stuff from glu.c was moved to glu_local.h
This patch then fixes 57 missing-declarations warnings.
ChangeLog:
- fix some -Wmissing-declarations warnings
Regards,
Stefan
-------------- next part --------------
Index: dlls/glu32/glu.c
===================================================================
RCS file: /home/wine/wine/dlls/glu32/glu.c,v
retrieving revision 1.6
diff -u -p -r1.6 glu.c
--- dlls/glu32/glu.c 13 Dec 2004 21:19:02 -0000 1.6
+++ dlls/glu32/glu.c 23 Jul 2005 14:52:20 -0000
@@ -23,6 +23,8 @@
#include "wine/debug.h"
+#include "glu_local.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(glu);
/* The only non-trivial bit of this is the *Tess* functions. Here we
@@ -33,36 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(glu);
(which is in fact just wine_tess_t), in the thunk itself we can
check whether we should call the _DATA or non _DATA type. */
-typedef struct {
- void *tess;
- void *polygon_data;
- void (CALLBACK *cb_tess_begin)(int);
- void (CALLBACK *cb_tess_begin_data)(int, void *);
- void (CALLBACK *cb_tess_vertex)(void *);
- void (CALLBACK *cb_tess_vertex_data)(void *, void *);
- void (CALLBACK *cb_tess_end)(void);
- void (CALLBACK *cb_tess_end_data)(void *);
- void (CALLBACK *cb_tess_error)(int);
- void (CALLBACK *cb_tess_error_data)(int, void *);
- void (CALLBACK *cb_tess_edge_flag)(int);
- void (CALLBACK *cb_tess_edge_flag_data)(int, void *);
- void (CALLBACK *cb_tess_combine)(double *, void *, float *, void **);
- void (CALLBACK *cb_tess_combine_data)(double *, void *, float *, void **, void *);
-} wine_tess_t;
-
-#define GLU_TESS_BEGIN 100100
-#define GLU_TESS_VERTEX 100101
-#define GLU_TESS_END 100102
-#define GLU_TESS_ERROR 100103
-#define GLU_TESS_EDGE_FLAG 100104
-#define GLU_TESS_COMBINE 100105
-#define GLU_TESS_BEGIN_DATA 100106
-#define GLU_TESS_VERTEX_DATA 100107
-#define GLU_TESS_END_DATA 100108
-#define GLU_TESS_ERROR_DATA 100109
-#define GLU_TESS_EDGE_FLAG_DATA 100110
-#define GLU_TESS_COMBINE_DATA 100111
-
/***********************************************************************
* gluLookAt (GLU32.@)
*/
--- /dev/null 2005-03-29 14:09:30.000000000 +0200
+++ dlls/glu32/glu_local.h 2005-07-23 16:55:03.000000000 +0200
@@ -0,0 +1,104 @@
+/*
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+typedef struct {
+ void *tess;
+ void *polygon_data;
+ void (CALLBACK *cb_tess_begin)(int);
+ void (CALLBACK *cb_tess_begin_data)(int, void *);
+ void (CALLBACK *cb_tess_vertex)(void *);
+ void (CALLBACK *cb_tess_vertex_data)(void *, void *);
+ void (CALLBACK *cb_tess_end)(void);
+ void (CALLBACK *cb_tess_end_data)(void *);
+ void (CALLBACK *cb_tess_error)(int);
+ void (CALLBACK *cb_tess_error_data)(int, void *);
+ void (CALLBACK *cb_tess_edge_flag)(int);
+ void (CALLBACK *cb_tess_edge_flag_data)(int, void *);
+ void (CALLBACK *cb_tess_combine)(double *, void *, float *, void **);
+ void (CALLBACK *cb_tess_combine_data)(double *, void *, float *, void **, void *);
+} wine_tess_t;
+
+#define GLU_TESS_BEGIN 100100
+#define GLU_TESS_VERTEX 100101
+#define GLU_TESS_END 100102
+#define GLU_TESS_ERROR 100103
+#define GLU_TESS_EDGE_FLAG 100104
+#define GLU_TESS_COMBINE 100105
+#define GLU_TESS_BEGIN_DATA 100106
+#define GLU_TESS_VERTEX_DATA 100107
+#define GLU_TESS_END_DATA 100108
+#define GLU_TESS_ERROR_DATA 100109
+#define GLU_TESS_EDGE_FLAG_DATA 100110
+#define GLU_TESS_COMBINE_DATA 100111
+
+int WINAPI wine_gluLookAt(double arg0,double arg1,double arg2,double arg3,double arg4,double arg5,double arg6,double arg7,double arg8);
+int WINAPI wine_gluOrtho2D(double arg0,double arg1,double arg2,double arg3);
+int WINAPI wine_gluPerspective(double arg0,double arg1,double arg2,double arg3);
+int WINAPI wine_gluPickMatrix(double arg0,double arg1,double arg2,double arg3,void *arg4);
+int WINAPI wine_gluProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8);
+int WINAPI wine_gluUnProject(double arg0,double arg1,double arg2,void *arg3,void *arg4,void *arg5,void *arg6,void *arg7,void *arg8);
+int WINAPI wine_gluErrorString(int arg0);
+int WINAPI wine_gluScaleImage(int arg0,int arg1,int arg2,int arg3,void *arg4,int arg5,int arg6,int arg7,void *arg8);
+int WINAPI wine_gluBuild1DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,void *arg5);
+int WINAPI wine_gluBuild2DMipmaps(int arg0,int arg1,int arg2,int arg3,int arg4,int arg5,void *arg6);
+int WINAPI wine_gluNewQuadric(void);
+int WINAPI wine_gluDeleteQuadric(void *arg0);
+int WINAPI wine_gluQuadricDrawStyle(void *arg0,int arg1);
+int WINAPI wine_gluQuadricOrientation(void *arg0,int arg1);
+int WINAPI wine_gluQuadricNormals(void *arg0,int arg1);
+int WINAPI wine_gluQuadricTexture(void *arg0,int arg1);
+int WINAPI wine_gluQuadricCallback(void *arg0,int arg1,void *arg2);
+int WINAPI wine_gluCylinder(void *arg0,double arg1,double arg2,double arg3,int arg4,int arg5);
+int WINAPI wine_gluSphere(void *arg0,double arg1,int arg2,int arg3);
+int WINAPI wine_gluDisk(void *arg0,double arg1,double arg2,int arg3,int arg4);
+int WINAPI wine_gluPartialDisk(void *arg0,double arg1,double arg2,int arg3,int arg4,double arg5,double arg6);
+int WINAPI wine_gluNewNurbsRenderer(void);
+int WINAPI wine_gluDeleteNurbsRenderer(void *arg0);
+int WINAPI wine_gluLoadSamplingMatrices(void *arg0,void *arg1,void *arg2,void *arg3);
+int WINAPI wine_gluNurbsProperty(void *arg0,int arg1,int arg2);
+int WINAPI wine_gluGetNurbsProperty(void *arg0,int arg1,void *arg2);
+int WINAPI wine_gluBeginCurve(void *arg0);
+int WINAPI wine_gluEndCurve(void *arg0);
+int WINAPI wine_gluNurbsCurve(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6);
+int WINAPI wine_gluBeginSurface(void *arg0);
+int WINAPI wine_gluEndSurface(void *arg0);
+int WINAPI wine_gluNurbsSurface(void *arg0,int arg1,void *arg2,int arg3,void *arg4,int arg5,int arg6,void *arg7,int arg8,int arg9,int arg10);
+int WINAPI wine_gluBeginTrim(void *arg0);
+int WINAPI wine_gluEndTrim(void *arg0);
+int WINAPI wine_gluPwlCurve(void *arg0,int arg1,void *arg2,int arg3,int arg4);
+int WINAPI wine_gluNurbsCallback(void *arg0,int arg1,void *arg2);
+int WINAPI wine_gluBeginPolygon(void *arg0);
+int WINAPI wine_gluEndPolygon(void *arg0);
+int WINAPI wine_gluNextContour(void *arg0,int arg1);
+int WINAPI wine_gluGetString(int arg0);
+int WINAPI wine_gluCheckExtension( const char *extName, void *extString );
+void * WINAPI wine_gluNewTess(void);
+void WINAPI wine_gluDeleteTess(void *tess);
+void WINAPI wine_gluTessBeginPolygon(void *tess, void *polygon_data);
+void WINAPI wine_gluTessEndPolygon(void *tess);
+void wine_glu_tess_begin_data(int type, wine_tess_t *wine_tess);
+void wine_glu_tess_vertex_data(void *vertex_data, wine_tess_t *wine_tess);
+void wine_glu_tess_end_data(wine_tess_t *wine_tess);
+void wine_glu_tess_error_data(int error, wine_tess_t *wine_tess);
+void wine_glu_tess_edge_flag_data(int flag, wine_tess_t *wine_tess);
+void wine_glu_tess_combine_data(double *coords, void *vertex_data, float *weight, void **outData,wine_tess_t *wine_tess);
+void WINAPI wine_gluTessCallback(void *tess,int which,void *fn);
+void WINAPI wine_gluTessBeginContour(void *tess);
+void WINAPI wine_gluTessEndContour(void *tess);
+void WINAPI wine_gluTessVertex(void *tess,void *arg1,void *arg2);
+void WINAPI wine_gluTessProperty(void *tess, int arg1, double arg2);
+void WINAPI wine_gluTessNormal(void *tess, double arg1, double arg2, double arg3);
+
More information about the wine-patches
mailing list