From f953ffc27d816d4969f825b8adfb5106e15cfd63 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 13 May 2002 15:43:10 +0000 Subject: Change _WIN32 to WIN32 for 1.1.x tree. Cleanup recent tooltip changes. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2215 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/gl.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'FL') diff --git a/FL/gl.h b/FL/gl.h index 882afd713..cd0a8b622 100644 --- a/FL/gl.h +++ b/FL/gl.h @@ -1,5 +1,5 @@ // -// "$Id: gl.h,v 1.6.2.4.2.2 2002/01/01 15:11:28 easysw Exp $" +// "$Id: gl.h,v 1.6.2.4.2.3 2002/05/13 15:43:09 easysw Exp $" // // OpenGL header file for the Fast Light Tool Kit (FLTK). // @@ -30,26 +30,26 @@ // Please report all bugs and problems to "fltk-bugs@fltk.org". // -#ifndef gl_draw_H -#define gl_draw_H +#ifndef FL_gl_H +# define FL_gl_H -#include "Enumerations.H" // for color names -#ifdef _WIN32 -# include -#endif -#ifndef APIENTRY -# if defined(__CYGWIN__) -# define APIENTRY __attribute__ ((__stdcall__)) -# else -# define APIENTRY -# endif -#endif +# include "Enumerations.H" // for color names +# ifdef WIN32 +# include +# endif +# ifndef APIENTRY +# if defined(__CYGWIN__) +# define APIENTRY __attribute__ ((__stdcall__)) +# else +# define APIENTRY +# endif +# endif -#ifdef __APPLE__ -# include -#else -# include -#endif +# ifdef __APPLE__ +# include +# else +# include +# endif FL_EXPORT void gl_start(); FL_EXPORT void gl_finish(); @@ -78,8 +78,8 @@ FL_EXPORT void gl_measure(const char*, int& x, int& y); FL_EXPORT void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, int ld=0); -#endif +#endif // !FL_gl_H // -// End of "$Id: gl.h,v 1.6.2.4.2.2 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: gl.h,v 1.6.2.4.2.3 2002/05/13 15:43:09 easysw Exp $". // -- cgit v1.2.3