fix warnings

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

diff --git a/cl_dyntexture.h b/cl_dyntexture.h
index be3f8e141b9a0297b7e9bbdffc7394bdfc2d791c..3b0a683470087a507d9cef1297ccb6ee2ccc4b28 100644 (file)
--- a/cl_dyntexture.h
+++ b/cl_dyntexture.h
@@ -17,4 +17,5 @@ void CL_LinkDynTexture( const char *name, rtexture_t *texture );
 // unlink a texture handle from its name\r
 void CL_UnlinkDynTexture( const char *name );\r
 \r
-#endif
\ No newline at end of file
+#endif\r
+\r

diff --git a/cl_gecko.h b/cl_gecko.h
index d73f70592012097cb8cacb28add4ef9f9808ea34..ce380743f9ce76e8245d3ffb1a1cf7e0982aaed2 100644 (file)
--- a/cl_gecko.h
+++ b/cl_gecko.h
@@ -37,4 +37,5 @@ qboolean CL_Gecko_Event_Key( clgecko_t *instance, int key, clgecko_buttoneventty
 \r
 #endif\r
 \r
-#endif
\ No newline at end of file
+#endif\r
+\r

diff --git a/cl_video.c b/cl_video.c
index d12854086f2deaf4fd790a1fbd53b3acdf8d2820..9c753de217556bd590aa998d4eafc786a9129544 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -35,7 +35,8 @@ static qboolean OpenStream( clvideo_t * video )
        return true;
 }
 
-static void VideoUpdateCallback(rtexture_t *rt, clvideo_t *video) {
+static void VideoUpdateCallback(rtexture_t *rt, void *data) {
+       clvideo_t *video = data;
        R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height );
 }
 

diff --git a/gl_textures.c b/gl_textures.c
index a57fe01295f00ef39b6e8a11085b4d377e8e8776..b8b904a5d27aa50f81be3c9925c5c8eb12f166ca 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -899,7 +899,7 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int
                case GLTEXTURETYPE_CUBEMAP:
                        // convert and upload each side in turn,
                        // from a continuous block of input texels
-                       texturebuffer = prevbuffer;
+                       texturebuffer = (unsigned char *)prevbuffer;
                        for (i = 0;i < 6;i++)
                        {
                                prevbuffer = texturebuffer;