diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
| commit | 0a6be0a83f368aff7df7e1a9c567d7e16b92a579 (patch) | |
| tree | 0fff69bdb746415afd1449a5e9afc216261fdd2e /src/gl_draw.cxx | |
| parent | 642187dc1c99cc041f181438473cda8894564c8b (diff) | |
Fix compiler warnings (STR 2988), porting from branch-1.3.
This commit is the accumulated patch introduced in branch 1.3
in svn r 11094, 11095, and 11096.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/gl_draw.cxx')
| -rw-r--r-- | src/gl_draw.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 377914c2c..2f91143d8 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -3,7 +3,7 @@ // // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2011 by Bill Spitzak and others. +// Copyright 1998-2016 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -179,7 +179,7 @@ void gl_remove_displaylist_fonts() #endif } -#if __APPLE__ +#ifdef __APPLE__ static void gl_draw_textures(const char* str, int n); #endif @@ -337,7 +337,7 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { glDrawPixels(w,h,d<4?GL_RGB:GL_RGBA,GL_UNSIGNED_BYTE,(const ulong*)b); } -#if __APPLE__ || defined(FL_DOXYGEN) +#if defined(__APPLE__) || defined(FL_DOXYGEN) /* Text drawing to an OpenGL scene under Mac OS X is implemented using textures, as recommended by Apple. This allows to use any font at any size, and any Unicode character. Some old Apple hardware doesn't implement the required GL_EXT_texture_rectangle extension. |