See e-mail from Martin Payne dated 11/30/09 at 5:51 AM. These changes include changi...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@854 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/VisualStudio2008/freeglut.vcproj b/VisualStudio2008/freeglut.vcproj
index 31e904e..bfc3b89 100644 (file)
--- a/VisualStudio2008/freeglut.vcproj
+++ b/VisualStudio2008/freeglut.vcproj
@@ -41,10 +41,9 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/D &quot;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES&quot;"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\include"\r
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"\r
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
@@ -125,7 +124,7 @@
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\include"\r
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"\r
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                WarningLevel="3"\r

diff --git a/VisualStudio2008Static/freeglut.vcproj b/VisualStudio2008Static/freeglut.vcproj
index fcfd283..32fd6bf 100644 (file)
--- a/VisualStudio2008Static/freeglut.vcproj
+++ b/VisualStudio2008Static/freeglut.vcproj
@@ -43,7 +43,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\include"\r
-                               PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB"\r
+                               PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
@@ -113,7 +113,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\include"\r
-                               PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB"\r
+                               PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r

diff --git a/configure.ac b/configure.ac
index 2f81174..9ee3c67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_SUBST([EXPORT_FLAGS])
 AC_HEADER_STDC
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
+AC_CHECK_HEADERS([usbhid.h errno.h GL/gl.h GL/glu.h GL/glx.h fcntl.h limits.h sys/ioctl.h sys/param.h sys/time.h])
 AC_HEADER_TIME
 AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], [], [], [#include <X11/Xlib.h>])
 AC_CHECK_HEADERS([X11/extensions/XI.h X11/extensions/XInput.h])

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index 7893f05..5161c03 100644 (file)
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -680,14 +680,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
     char* geometry = NULL;
     int i, j, argc = *pargc;
 
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
-    size_t sLen;
-#if HAVE_ERRNO
-    errno_t err;
-#endif
-#endif
-
     if( fgState.Initialised )
         fgError( "illegal glutInit() reinitialization attempt" );
 
@@ -707,15 +699,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
     /* check if GLUT_FPS env var is set */
 #ifndef _WIN32_WCE
     {
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
-        char* fps = NULL;
-        err = _dupenv_s( &fps, &sLen, "GLUT_FPS" );
-        if (err)
-            fgError("Error getting GLUT_FPS environment variable"); 
-#else
         const char *fps = getenv( "GLUT_FPS" );
-#endif
+
         if( fps )
         {
             int interval;
@@ -726,20 +711,9 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
             else
                 fgState.FPSInterval = interval;
         }
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
-        free ( fps );  fps = NULL;  /* dupenv_s allocates a string that we must free */
-#endif
     }
 
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
-    err = _dupenv_s( &displayName, &sLen, "DISPLAY" );
-    if (err)
-        fgError("Error getting DISPLAY environment variable");
-#else
     displayName = getenv( "DISPLAY" );
-#endif
 
     for( i = 1; i < argc; i++ )
     {
@@ -824,10 +798,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
      * variable for opening the X display (see code above):
      */
     fghInitialize( displayName );
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
-    free ( displayName );  displayName = NULL;  /* dupenv_s allocates a string that we must free */
-#endif
 
     /*
      * Geometry parsing deffered until here because we may need the screen
@@ -936,21 +906,13 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
      * delimited by blanks or tabs.
      */
     char *token ;
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
-    char *next_token = NULL;
-#endif
     size_t len = strlen ( displayMode );
     char *buffer = (char *)malloc ( (len+1) * sizeof(char) );
     memcpy ( buffer, displayMode, len );
     buffer[len] = '\0';
 
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
-    token = strtok_s ( buffer, " \t", &next_token );
-#else
     token = strtok ( buffer, " \t" );
-#endif
+
     while ( token )
     {
         /* Process this token */
@@ -1127,12 +1089,7 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
             break ;
         }
 
-    /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
-        token = strtok_s ( NULL, " \t", &next_token );
-#else
         token = strtok ( NULL, " \t" );
-#endif
     }
 
     free ( buffer );

diff --git a/src/freeglut_input_devices.c b/src/freeglut_input_devices.c
index 0e202fa..0dcb97f 100755 (executable)
--- a/src/freeglut_input_devices.c
+++ b/src/freeglut_input_devices.c
@@ -36,7 +36,7 @@
 #include "freeglut_internal.h"
 
 #if TARGET_HOST_POSIX_X11
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
 #include <errno.h>
 #endif
 #include <sys/ioctl.h>
@@ -140,17 +140,8 @@ void fgInitialiseInputDevices ( void )
 {
     if( !fgState.InputDevsInitialised )
     {
-      /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
-        char *dial_device=NULL;
-        size_t sLen;
-        errno_t err = _dupenv_s( &dial_device, &sLen, "GLUT_DIALS_SERIAL" );
-        if (err)
-            fgError("Error getting GLUT_DIALS_SERIAL environment variable");
-#else
         const char *dial_device=NULL;
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );
-#endif
 #if TARGET_HOST_MS_WINDOWS
         if (!dial_device){
             static char devname[256];
@@ -167,10 +158,6 @@ void fgInitialiseInputDevices ( void )
 #endif
         if ( !dial_device ) return;
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
-      /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
-        free ( dial_device );  dial_device = NULL;  /* dupenv_s allocates a string that we must free */
-#endif
         serial_putchar(dialbox_port,DIAL_INITIALIZE);
         glutTimerFunc ( 10, poll_dials, 0 );
         fgState.InputDevsInitialised = GL_TRUE;

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index c009377..2a57e29 100644 (file)
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -75,7 +75,7 @@
 #    if HAVE_FCNTL_H
 #        include <fcntl.h>
 #    endif
-#    if HAVE_ERRNO
+#    if HAVE_ERRNO_H
 #        include <errno.h>
 #    endif
 #    if defined(__FreeBSD__) || defined(__NetBSD__)
@@ -240,7 +240,7 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
       if (cp)
         return 1;
     }
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
     else if (errno == EACCES) {
       if (!protection_warned) {
         fgWarning ( "Can't open %s for read!", buf );
@@ -265,7 +265,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os,
 
     if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
     {
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
         fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
 #else
         fgWarning ( "error: %s", os->fname );
@@ -279,7 +279,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os,
         if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
         {
             /*** XXX {report_id} may not be the right variable? ***/
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
             fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
 #else
             fgWarning ( "error: %s%d", UHIDDEV, report_id );
@@ -676,7 +676,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
             }
         }
     }
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
     if ( len < 0 && errno != EAGAIN )
 #else
     if ( len < 0 )
@@ -699,7 +699,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
 
         if ( status != sizeof( struct js_event ) )
         {
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
             if ( errno == EAGAIN )
             {
                 /* Use the old values */
@@ -1317,7 +1317,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
 
     joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
 
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
     if( joy->os->fd < 0 && errno == EACCES )
         fgWarning ( "%s exists but is not readable by you", joy->os->fname );
 #endif

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index 0a45402..1c308df 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -27,7 +27,7 @@
 
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
 #    include <errno.h>
 #endif
 #include <stdarg.h>
@@ -473,7 +473,7 @@ static void fghSleepForEvents( void )
         wait.tv_usec = (msec % 1000) * 1000;
         err = select( socket+1, &fdset, NULL, NULL, &wait );
 
-#if HAVE_ERRNO
+#if HAVE_ERRNO_H
         if( ( -1 == err ) && ( errno != EINTR ) )
             fgWarning ( "freeglut select() error: %d", errno );
 #endif

diff --git a/src/freeglut_spaceball.c b/src/freeglut_spaceball.c
index a36008e..154e52d 100644 (file)
--- a/src/freeglut_spaceball.c
+++ b/src/freeglut_spaceball.c
@@ -215,7 +215,10 @@ OF SUCH DAMAGE.
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
+\r
+#if HAVE_ERRNO_H\r
 #include <errno.h>\r
+#endif\r
 \r
 #include <X11/Xlib.h>\r
 #include <X11/Xutil.h>\r