Mesa (master): glut: Don't try to guess system headers.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Feb 12 13:54:59 UTC 2009
Module: Mesa
Branch: master
Commit: b5c901a73060d0b18746d83fc8977e8bbe7ee784
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5c901a73060d0b18746d83fc8977e8bbe7ee784
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Feb 12 13:52:16 2009 +0000
glut: Don't try to guess system headers.
Just include them, especially such basic header as stdlib.h
---
include/GL/glut.h | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/include/GL/glut.h b/include/GL/glut.h
index 022378f..c305b9a 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
More information about the mesa-commit
mailing list