diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
| commit | 59d54334c96f44ed1d8bf660dc96221362a77d04 (patch) | |
| tree | e9ab34e568256bcdc2a88602c47072ab769211e8 /include/GL/glut.h | |
| parent | 7c8836e9ef49d938aa55a1c385b95c6371c301f1 (diff) | |
| parent | c5c383596ddb26cd75e4b355918ad16915283b59 (diff) | |
Merge branch 'master' into gallium-texture-transfer
Conflicts:
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'include/GL/glut.h')
| -rw-r--r-- | include/GL/glut.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/include/GL/glut.h b/include/GL/glut.h index 022378fb9d..9fdb9cfdfa 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -74,23 +74,9 @@ extern "C" { # define __cdecl # define GLUT_DEFINED___CDECL # endif -# ifndef _CRTIMP -# ifdef _NTSDK - /* Definition compatible with NT SDK */ -# define _CRTIMP -# else - /* Current definition */ -# ifdef _DLL -# define _CRTIMP __declspec(dllimport) -# else -# define _CRTIMP -# endif -# endif -# define GLUT_DEFINED__CRTIMP -# endif -# ifndef GLUT_BUILDING_LIB -extern _CRTIMP void __cdecl exit(int); -# endif +#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) +#include <stdlib.h> +#endif /* GLUT callback calling convention for Win32. */ # define GLUTCALLBACK __cdecl @@ -122,7 +108,7 @@ extern _CRTIMP void __cdecl exit(int); # define GLUTAPIENTRY # define GLUTAPIENTRYV # define GLUTCALLBACK -# define GLUTAPI __attribute__((visibility("default"))) +# define GLUTAPI extern __attribute__((visibility("default"))) #else |