Merge branch 'Avoid_gl_h_Function_is_not_a_prototype_warning' into 'master'
gl.h: avoid gcc warning "function declaration isn’t a prototype" See merge request simulant/GLdc!97
This commit is contained in:
commit
46605c6b1a
|
@ -450,8 +450,8 @@ __BEGIN_DECLS
|
||||||
#define GLAPI extern
|
#define GLAPI extern
|
||||||
#define APIENTRY
|
#define APIENTRY
|
||||||
|
|
||||||
GLAPI void APIENTRY glFlush();
|
GLAPI void APIENTRY glFlush(void);
|
||||||
GLAPI void APIENTRY glFinish();
|
GLAPI void APIENTRY glFinish(void);
|
||||||
|
|
||||||
/* Start Submission of Primitive Data */
|
/* Start Submission of Primitive Data */
|
||||||
/* Currently Supported Primitive Types:
|
/* Currently Supported Primitive Types:
|
||||||
|
@ -463,7 +463,7 @@ GLAPI void APIENTRY glFinish();
|
||||||
GLAPI void APIENTRY glBegin(GLenum mode);
|
GLAPI void APIENTRY glBegin(GLenum mode);
|
||||||
|
|
||||||
/* Finish Submission of Primitive Data */
|
/* Finish Submission of Primitive Data */
|
||||||
GLAPI void APIENTRY glEnd();
|
GLAPI void APIENTRY glEnd(void);
|
||||||
|
|
||||||
/* Primitive Texture Coordinate Submission */
|
/* Primitive Texture Coordinate Submission */
|
||||||
GLAPI void APIENTRY glTexCoord1f(GLfloat u);
|
GLAPI void APIENTRY glTexCoord1f(GLfloat u);
|
||||||
|
@ -629,15 +629,15 @@ GLAPI void APIENTRY glDisableClientState(GLenum cap);
|
||||||
|
|
||||||
GLAPI void APIENTRY glMatrixMode(GLenum mode);
|
GLAPI void APIENTRY glMatrixMode(GLenum mode);
|
||||||
|
|
||||||
GLAPI void APIENTRY glLoadIdentity();
|
GLAPI void APIENTRY glLoadIdentity(void);
|
||||||
|
|
||||||
GLAPI void APIENTRY glLoadMatrixf(const GLfloat *m);
|
GLAPI void APIENTRY glLoadMatrixf(const GLfloat *m);
|
||||||
GLAPI void APIENTRY glLoadTransposeMatrixf(const GLfloat *m);
|
GLAPI void APIENTRY glLoadTransposeMatrixf(const GLfloat *m);
|
||||||
GLAPI void APIENTRY glMultMatrixf(const GLfloat *m);
|
GLAPI void APIENTRY glMultMatrixf(const GLfloat *m);
|
||||||
GLAPI void APIENTRY glMultTransposeMatrixf(const GLfloat *m);
|
GLAPI void APIENTRY glMultTransposeMatrixf(const GLfloat *m);
|
||||||
|
|
||||||
GLAPI void APIENTRY glPushMatrix();
|
GLAPI void APIENTRY glPushMatrix(void);
|
||||||
GLAPI void APIENTRY glPopMatrix();
|
GLAPI void APIENTRY glPopMatrix(void);
|
||||||
|
|
||||||
GLAPI void APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z);
|
GLAPI void APIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z);
|
||||||
#define glTranslated glTranslatef
|
#define glTranslated glTranslatef
|
||||||
|
|
Loading…
Reference in New Issue
Block a user