GCC warning fixes

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7966 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_gecko.c b/cl_gecko.c
index 3819aea2ee2255f1a7556d37e1b3e164ffe7b051..bff858c91fce5a6d6d4b4fcd3851228ac3970e83 100644 (file)
--- a/cl_gecko.c
+++ b/cl_gecko.c
@@ -294,7 +294,8 @@ clgecko_t * CL_Gecko_FindBrowser( const char *name ) {
        return NULL;\r
 }\r
 \r
        return NULL;\r
 }\r
 \r

-static void cl_gecko_updatecallback( rtexture_t *texture, clgecko_t *instance ) {\r
+static void cl_gecko_updatecallback( rtexture_t *texture, void* callbackData ) {
+       clgecko_t *instance = callbackData;\r

        const unsigned char *data;\r
        if( instance->browser ) {\r
                // TODO: OSGK only supports BGRA right now\r
        const unsigned char *data;\r
        if( instance->browser ) {\r
                // TODO: OSGK only supports BGRA right now\r


@@ -714,7 +715,7 @@ static geckokeymapping_t geckokeymappingtable[] = {
        { K_SCROLLOCK, OSGKKey_ScrollLock }\r
 };\r
 \r
        { K_SCROLLOCK, OSGKKey_ScrollLock }\r
 };\r
 \r

-qboolean CL_Gecko_Event_Key( clgecko_t *instance, int key, clgecko_buttoneventtype_t eventtype ) {\r
+qboolean CL_Gecko_Event_Key( clgecko_t *instance, keynum_t key, clgecko_buttoneventtype_t eventtype ) {\r

        if( !instance || !instance->browser ) {\r
                return false;\r
        }\r
        if( !instance || !instance->browser ) {\r
                return false;\r
        }\r


@@ -725,7 +726,7 @@ qboolean CL_Gecko_Event_Key( clgecko_t *instance, int key, clgecko_buttoneventty
                OSGK_KeyboardEventType mappedtype;\r
                unsigned int mappedkey = key;\r
                \r
                OSGK_KeyboardEventType mappedtype;\r
                unsigned int mappedkey = key;\r
                \r

-               int i;\r
+               unsigned int i;\r

                // yes! then convert it if necessary!\r
                for( i = 0 ; i < sizeof( geckokeymappingtable ) / sizeof( *geckokeymappingtable ) ; i++ ) {\r
                        const geckokeymapping_t * const mapping = &geckokeymappingtable[ i ];\r
                // yes! then convert it if necessary!\r
                for( i = 0 ; i < sizeof( geckokeymappingtable ) / sizeof( *geckokeymappingtable ) ; i++ ) {\r
                        const geckokeymapping_t * const mapping = &geckokeymappingtable[ i ];\r

diff --git a/cl_gecko.h b/cl_gecko.h
index 05b74e92c82f203ae0858a1daf9eaffebef09b2a..3dd733723c3c2a64800931de7cfe45f039ed4e07 100644 (file)
--- a/cl_gecko.h
+++ b/cl_gecko.h
@@ -31,7 +31,7 @@ void CL_Gecko_NavigateToURI( clgecko_t *instance, const char *URI );
 void CL_Gecko_Event_CursorMove( clgecko_t *instance, float x, float y );\r
 \r
 // returns whether the key/button event was handled or not\r
 void CL_Gecko_Event_CursorMove( clgecko_t *instance, float x, float y );\r
 \r
 // returns whether the key/button event was handled or not\r

-qboolean CL_Gecko_Event_Key( clgecko_t *instance, int key, clgecko_buttoneventtype_t eventtype );\r
+qboolean CL_Gecko_Event_Key( clgecko_t *instance, keynum_t key, clgecko_buttoneventtype_t eventtype );\r

 \r
 void CL_Gecko_Resize( clgecko_t *instance, int width, int height );\r
 // get the ratio between gecko instance's size in the texture and the actual texture size..\r
 \r
 void CL_Gecko_Resize( clgecko_t *instance, int width, int height );\r
 // get the ratio between gecko instance's size in the texture and the actual texture size..\r

diff --git a/timing.h b/timing.h
index 3dd3602cbc5dcfb892445cf7b73f51e457fab4b5..310f4e8f1164c7437598350206636b1a6c635e5f 100644 (file)
--- a/timing.h
+++ b/timing.h
@@ -54,4 +54,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #endif
 
 
 #endif
 

-#endif // __TIMING_H__
\ No newline at end of file
+#endif // __TIMING_H__
+