FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak the build: C++ style comments are not allowed in ISO C90

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@806 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2009-03-26 16:12:42 +00:00
parent b8bb61e933
commit 0a11d248c1
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
freeglut/freeglut/src/freeglut_init.c
View File

@ -677,7 +677,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
char* geometry = NULL; char* geometry = NULL;
int i, j, argc = *pargc; int i, j, argc = *pargc;
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
size_t sLen; size_t sLen;
errno_t err; errno_t err;
#endif #endif
@ -701,7 +702,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
/* check if GLUT_FPS env var is set */ /* check if GLUT_FPS env var is set */
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
{ {
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
char* fps = NULL; char* fps = NULL;
err = _dupenv_s( &fps, &sLen, "GLUT_FPS" ); err = _dupenv_s( &fps, &sLen, "GLUT_FPS" );
if (err) if (err)
@ -719,12 +721,14 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
else else
fgState.FPSInterval = interval; fgState.FPSInterval = interval;
} }
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
free ( fps ); fps = NULL; /* dupenv_s allocates a string that we must free */ free ( fps ); fps = NULL; /* dupenv_s allocates a string that we must free */
#endif #endif
} }
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
err = _dupenv_s( &displayName, &sLen, "DISPLAY" ); err = _dupenv_s( &displayName, &sLen, "DISPLAY" );
if (err) if (err)
fgError("Error getting DISPLAY environment variable"); fgError("Error getting DISPLAY environment variable");
@ -815,7 +819,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
* variable for opening the X display (see code above): * variable for opening the X display (see code above):
*/ */
fghInitialize( displayName ); fghInitialize( displayName );
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
free ( displayName ); displayName = NULL; /* dupenv_s allocates a string that we must free */ free ( displayName ); displayName = NULL; /* dupenv_s allocates a string that we must free */
#endif #endif
@ -916,7 +921,8 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
* delimited by blanks or tabs. * delimited by blanks or tabs.
*/ */
char *token ; char *token ;
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
char *next_token = NULL; char *next_token = NULL;
#endif #endif
size_t len = strlen ( displayMode ); size_t len = strlen ( displayMode );
@ -924,7 +930,8 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
memcpy ( buffer, displayMode, len ); memcpy ( buffer, displayMode, len );
buffer[len] = '\0'; buffer[len] = '\0';
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
token = strtok_s ( buffer, " \t", &next_token ); token = strtok_s ( buffer, " \t", &next_token );
#else #else
token = strtok ( buffer, " \t" ); token = strtok ( buffer, " \t" );
@ -1105,7 +1112,8 @@ void FGAPIENTRY glutInitDisplayString( const char* displayMode )
break ; break ;
} }
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
token = strtok_s ( NULL, " \t", &next_token ); token = strtok_s ( NULL, " \t", &next_token );
#else #else
token = strtok ( NULL, " \t" ); token = strtok ( NULL, " \t" );

6
freeglut/freeglut/src/freeglut_input_devices.c
View File

@ -138,7 +138,8 @@ void fgInitialiseInputDevices ( void )
{ {
if( !fgState.InputDevsInitialised ) if( !fgState.InputDevsInitialised )
{ {
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
char *dial_device=NULL; char *dial_device=NULL;
size_t sLen; size_t sLen;
errno_t err = _dupenv_s( &dial_device, &sLen, "GLUT_DIALS_SERIAL" ); errno_t err = _dupenv_s( &dial_device, &sLen, "GLUT_DIALS_SERIAL" );
@ -164,7 +165,8 @@ void fgInitialiseInputDevices ( void )
#endif #endif
if ( !dial_device ) return; if ( !dial_device ) return;
if ( !( dialbox_port = serial_open ( dial_device ) ) ) return; if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher /* will return true for VC8 (VC2005) and higher */
#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
free ( dial_device ); dial_device = NULL; /* dupenv_s allocates a string that we must free */ free ( dial_device ); dial_device = NULL; /* dupenv_s allocates a string that we must free */
#endif #endif
serial_putchar(dialbox_port,DIAL_INITIALIZE); serial_putchar(dialbox_port,DIAL_INITIALIZE);