gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One more try to fix the APIENTRY stuff in glut.h. The file gl.h now

Browse Source 
defines APIENTRY in all cases.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1339 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Bill Spitzak 2000-11-28 15:32:07 +00:00
parent 3988dbf8bd
commit 45c06ba2c4
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FL/gl.h
View File

@ -1,5 +1,5 @@
//
// "$Id: gl.h,v 1.6.2.2 2000/06/05 21:20:34 mike Exp $"
// "$Id: gl.h,v 1.6.2.3 2000/11/28 15:32:07 spitzak Exp $"
//
// OpenGL header file for the Fast Light Tool Kit (FLTK).
//
@ -34,9 +34,16 @@
#define gl_draw_H
#include "Enumerations.H" // for color names
#ifdef WIN32
#ifdef _WIN32
# include <windows.h>
#endif
#ifndef APIENTRY
# if defined(__CYGWIN__)
# define APIENTRY __attribute__ ((__stdcall__))
# else
# define APIENTRY
# endif
#endif
#include <GL/gl.h>
FL_EXPORT void gl_start();
@ -69,5 +76,5 @@ FL_EXPORT void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, in
#endif
//
// End of "$Id: gl.h,v 1.6.2.2 2000/06/05 21:20:34 mike Exp $".
// End of "$Id: gl.h,v 1.6.2.3 2000/11/28 15:32:07 spitzak Exp $".
//

8
FL/glut.H
View File

@ -1,5 +1,5 @@
//
// "$Id: glut.H,v 1.6.2.5 2000/10/21 20:01:55 spitzak Exp $"
// "$Id: glut.H,v 1.6.2.6 2000/11/28 15:32:07 spitzak Exp $"
//
// GLUT emulation header file for the Fast Light Tool Kit (FLTK).
//
@ -428,10 +428,6 @@ FL_EXPORT int glutBitmapWidth(void *font, int character);
extern "C" {
#ifndef APIENTRY
#define APIENTRY
#endif
extern APIENTRY int glutExtensionSupported(char *name);
/* Stroke font opaque addresses (use constants instead in source code). */
@ -476,5 +472,5 @@ extern APIENTRY void glutSolidIcosahedron();
#endif /* __glut_h__ */
//
// End of "$Id: glut.H,v 1.6.2.5 2000/10/21 20:01:55 spitzak Exp $".
// End of "$Id: glut.H,v 1.6.2.6 2000/11/28 15:32:07 spitzak Exp $".
//