summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-05-13 15:43:10 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-05-13 15:43:10 +0000
commitf953ffc27d816d4969f825b8adfb5106e15cfd63 (patch)
treefadef5cb3a1bfd4648118d5d2bf69cc5ec0f1780 /FL
parent80d05eb962ce78a43faf15c572158f603ce5a029 (diff)
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
Diffstat (limited to 'FL')
-rw-r--r--FL/gl.h42
1 files changed, 21 insertions, 21 deletions
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 <windows.h>
-#endif
-#ifndef APIENTRY
-# if defined(__CYGWIN__)
-# define APIENTRY __attribute__ ((__stdcall__))
-# else
-# define APIENTRY
-# endif
-#endif
+# include "Enumerations.H" // for color names
+# ifdef WIN32
+# include <windows.h>
+# endif
+# ifndef APIENTRY
+# if defined(__CYGWIN__)
+# define APIENTRY __attribute__ ((__stdcall__))
+# else
+# define APIENTRY
+# endif
+# endif
-#ifdef __APPLE__
-# include <OpenGL/gl.h>
-#else
-# include <GL/gl.h>
-#endif
+# ifdef __APPLE__
+# include <OpenGL/gl.h>
+# else
+# include <GL/gl.h>
+# 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 $".
//