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/glut_compatability.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/glut_compatability.cxx')
| -rw-r--r-- | src/glut_compatability.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx index 9b1f9e6dd..1031b94ae 100644 --- a/src/glut_compatability.cxx +++ b/src/glut_compatability.cxx @@ -3,7 +3,7 @@ // // GLUT emulation routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 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 @@ -34,7 +34,7 @@ # define GLX_GLXEXT_LEGACY # include <GL/glx.h> # endif // HAVE_GLXGETPROCADDRESSARB -# ifdef HAVE_DLFCN_H +# if HAVE_DLFCN_H # include <dlfcn.h> # endif // HAVE_DLFCN_H # define MAXWINDOWS 32 @@ -443,7 +443,7 @@ GLUTproc glutGetProcAddress(const char *procName) { # ifdef WIN32 return (GLUTproc)wglGetProcAddress((LPCSTR)procName); -# elif defined(HAVE_DLSYM) && defined(HAVE_DLFCN_H) +# elif (HAVE_DLSYM && HAVE_DLFCN_H) char symbol[1024]; snprintf(symbol, sizeof(symbol), "_%s", procName); |