diff options
| author | Julien Cristau <jcristau@debian.org> | 2007-08-28 11:06:22 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2007-08-28 11:06:22 +0200 |
| commit | 7d92c50490d110b90fd211cc0177084000cc8156 (patch) | |
| tree | bbcd9484e189b519a63aecacebdabc44ea7677ed /include | |
| parent | 34beaefe1cf93adf34d3a992e5bdf863c1a00461 (diff) | |
| parent | d69a5961931fcac4b876c55ebfe0189fd11b8d71 (diff) | |
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/glu.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/include/GL/glu.h b/include/GL/glu.h index d82103d141a..7db4b707b51 100644 --- a/include/GL/glu.h +++ b/include/GL/glu.h @@ -44,22 +44,17 @@ #define GLAPIENTRYP GLAPIENTRY * #endif -#ifdef GLAPI -#undef GLAPI -#endif - -# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32) -# define GLAPI __declspec(dllexport) -# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ -# define GLAPI __declspec(dllimport) -# else /* for use with static link lib build of Win32 edition only */ -# define GLAPI extern -# endif /* _STATIC_MESA support */ - - -#ifndef GLAPI -#define GLAPI -#endif +#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32) +# undef GLAPI +# define GLAPI __declspec(dllexport) +#elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) +/* tag specifying we're building for DLL runtime support */ +# undef GLAPI +# define GLAPI __declspec(dllimport) +#elif !defined(GLAPI) +/* for use with static link lib build of Win32 edition only */ +# define GLAPI extern +#endif /* _STATIC_MESA support */ #ifdef __cplusplus extern "C" { |