diff options
| author | michal <michal@michal-laptop.(none)> | 2007-07-27 10:05:40 +0200 |
|---|---|---|
| committer | michal <michal@michal-laptop.(none)> | 2007-07-27 10:05:40 +0200 |
| commit | e0a26b046764ae80748b347395ab1b27de83651e (patch) | |
| tree | ea702756a3e9cedc3b3c41241cbff0956ddc82bc /src/glut/glx/glutint.h | |
| parent | 0360b49afbcd839f99ba0745d01cf9dc5be4d122 (diff) | |
| parent | e3cef5887540016a6d198598cb50bebe09e3f4cf (diff) | |
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/glut/glx/glutint.h')
| -rw-r--r-- | src/glut/glx/glutint.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glut/glx/glutint.h b/src/glut/glx/glutint.h index 6fe09ffe7e..a962c78023 100644 --- a/src/glut/glx/glutint.h +++ b/src/glut/glx/glutint.h @@ -26,7 +26,10 @@ #include <GL/glx.h> #endif +#ifndef GLUT_BUILDING_LIB #define GLUT_BUILDING_LIB /* Building the GLUT library itself. */ +#endif + #include <GL/glut.h> #if defined(MESA) && defined(_WIN32) && !defined(__CYGWIN32__) |