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

Fix a few more compiler warnings

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1259 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-04-21 19:04:02 +00:00
parent 46fd1bbdf5
commit d554cb9ab1
8 changed files with 79 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -99,6 +99,7 @@ freeglut/freeglut/src/fg_geometry.c svn_keywords=Author+Date+Id+Revision
freeglut/freeglut/src/fg_gl2.c -text freeglut/freeglut/src/fg_gl2.c -text
freeglut/freeglut/src/fg_gl2.h -text freeglut/freeglut/src/fg_gl2.h -text
freeglut/freeglut/src/fg_init.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/fg_init.c svn_keywords=Author+Date+Id+Revision
freeglut/freeglut/src/fg_init.h -text
freeglut/freeglut/src/fg_input_devices.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/fg_input_devices.c svn_keywords=Author+Date+Id+Revision
freeglut/freeglut/src/fg_internal.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/fg_internal.h svn_keywords=Author+Date+Id+Revision
freeglut/freeglut/src/fg_joystick.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/fg_joystick.c svn_keywords=Author+Date+Id+Revision
@ -150,6 +151,7 @@ freeglut/freeglut/src/x11/fg_menu_x11.c svnc_svn_005fkeywords=Author+Date+Id+Rev
freeglut/freeglut/src/x11/fg_spaceball_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision freeglut/freeglut/src/x11/fg_spaceball_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision
freeglut/freeglut/src/x11/fg_state_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision freeglut/freeglut/src/x11/fg_state_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision
freeglut/freeglut/src/x11/fg_state_x11_glx.c -text freeglut/freeglut/src/x11/fg_state_x11_glx.c -text
freeglut/freeglut/src/x11/fg_state_x11_glx.h -text
freeglut/freeglut/src/x11/fg_structure_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision freeglut/freeglut/src/x11/fg_structure_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision
freeglut/freeglut/src/x11/fg_window_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision freeglut/freeglut/src/x11/fg_window_x11.c svnc_svn_005fkeywords=Author+Date+Id+Revision
freeglut/freeglut/src/x11/fg_window_x11_glx.c -text freeglut/freeglut/src/x11/fg_window_x11_glx.c -text

1
freeglut/freeglut/CMakeLists.txt
View File

@ -145,6 +145,7 @@ ELSE()
src/x11/fg_internal_x11_glx.h src/x11/fg_internal_x11_glx.h
src/x11/fg_display_x11_glx.c src/x11/fg_display_x11_glx.c
src/x11/fg_state_x11_glx.c src/x11/fg_state_x11_glx.c
src/x11/fg_state_x11_glx.h
src/x11/fg_window_x11_glx.c src/x11/fg_window_x11_glx.c
src/x11/fg_window_x11_glx.h src/x11/fg_window_x11_glx.h
) )

2
freeglut/freeglut/src/egl/fg_state_egl.c
View File

@ -33,7 +33,7 @@
static int fgPlatformGetConfig( int attribute ) static int fgPlatformGetConfig( int attribute )
{ {
int returnValue = 0; int returnValue = 0;
int result; /* Not checked */ int result __fg_unused; /* Not checked */
if( fgStructure.CurrentWindow ) if( fgStructure.CurrentWindow )
result = eglGetConfigAttrib( fgDisplay.pDisplay.egl.Display, result = eglGetConfigAttrib( fgDisplay.pDisplay.egl.Display,

34
freeglut/freeglut/src/fg_init.h Normal file
View File

@ -0,0 +1,34 @@
/*
* fg_init.h
*
* Various freeglut initialization functions.
*
* Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
* Written by Pawel W. Olszta, <olszta@sourceforge.net>
* Creation date: Thu Dec 2 1999
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __FG_INIT_H__
#define __FG_INIT_H__
extern void fghCloseInputDevices(void);
extern void fgDeinitialize(void);
#endif

2
freeglut/freeglut/src/x11/fg_state_x11.c
View File

@ -29,6 +29,8 @@
#include "fg_internal.h" #include "fg_internal.h"
#ifdef EGL_VERSION_1_0 #ifdef EGL_VERSION_1_0
#include "egl/fg_state_egl.h" #include "egl/fg_state_egl.h"
#else
#include "x11/fg_state_x11_glx.h"
#endif #endif
int fgPlatformGlutDeviceGet ( GLenum eWhat ) int fgPlatformGlutDeviceGet ( GLenum eWhat )

5
freeglut/freeglut/src/x11/fg_state_x11_glx.c
View File

@ -27,6 +27,7 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "fg_internal.h" #include "fg_internal.h"
#include "x11/fg_window_x11_glx.h"
/* /*
* Queries the GL context about some attributes * Queries the GL context about some attributes
@ -34,7 +35,7 @@
int fgPlatformGetConfig( int attribute ) int fgPlatformGetConfig( int attribute )
{ {
int returnValue = 0; int returnValue = 0;
int result; /* Not checked */ int result __fg_unused; /* Not checked */
if( fgStructure.CurrentWindow ) if( fgStructure.CurrentWindow )
result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display, result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
@ -170,7 +171,7 @@ int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
if (fbconfigArray != NULL) if (fbconfigArray != NULL)
{ {
int * temp_array; int * temp_array;
int result; /* Returned by glXGetFBConfigAttrib. Not checked. */ int result __fg_unused; /* Returned by glXGetFBConfigAttrib. Not checked. */
int previous_value; int previous_value;
int i; int i;

35
freeglut/freeglut/src/x11/fg_state_x11_glx.h Normal file
View File

@ -0,0 +1,35 @@
/*
* fg_state_x11_glx.c
*
* X11-specific freeglut state query methods.
*
* Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
* Written by Pawel W. Olszta, <olszta@sourceforge.net>
* Copied for Platform code by Evan Felix <karcaw at gmail.com>
* Creation date: Thur Feb 2 2012
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __FG_STATE_X11_GLX_H__
#define __FG_STATE_X11_GLX_H__
int fgPlatformGetConfig(int attribute);
int fghPlatformGlutGetGLX(GLenum eWhat);
#endif

2
freeglut/freeglut/src/x11/fg_window_x11_glx.c
View File

@ -115,7 +115,7 @@ int fghChooseConfig(GLXFBConfig* fbconfig)
if (fbconfigArray != NULL) if (fbconfigArray != NULL)
{ {
int result; /* Returned by glXGetFBConfigAttrib, not checked. */ int result __fg_unused; /* Returned by glXGetFBConfigAttrib, not checked. */
if( wantIndexedMode ) if( wantIndexedMode )