[Opentnl-cvs] tnl/glut glut.h,1.1,1.2

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/glut
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14491/glut

Modified Files:
	glut.h 
Log Message:
Integrated Norbert's patch for Win32 CodeWarrior support
Changed instructions screen to display help for current controls configuration

Index: glut.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/glut/glut.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** glut.h	20 Apr 2004 04:27:13 -0000	1.1
--- glut.h	28 Sep 2004 18:45:22 -0000	1.2
***************
*** 144,148 ****
  #if defined(_WIN32)
  # ifndef GLUT_BUILDING_LIB
! extern _CRTIMP void __cdecl exit(int);
  # endif
  #else
--- 144,155 ----
  #if defined(_WIN32)
  # ifndef GLUT_BUILDING_LIB
! /* CodeWarrior for Win32 does a "using std::exit;" in stdlib.h. 
!    So declaring ::exit(int) would cause an ambiguous error if 
!    someone would include stdlib.h before glut.h. */
! #  if defined(__MWERKS__) && defined(__cplusplus)
!      extern _CRTIMP void __cdecl std::exit(int);
! #  else
!      extern _CRTIMP void __cdecl exit(int);
! #  endif
  # endif
  #else