Remove -Wno-incompatible-pointer-types

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a8f62c9e208d82b425b71a0e0eb7629b8cdc7e4..bf5e235edccefd0f4bad15bbe103542d13d32b7a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,8 +95,6 @@ addflags("-Wno-unused-variable")
 addflags("-Wno-unused-parameter")
 addflags("-Wno-missing-field-initializers")
 
-addflags_c("-Wno-incompatible-pointer-types")
-
 set(CMAKE_POSITION_INDEPENDENT_CODE 1)
 set(GTK_TARGET 2 CACHE STRING "GTK target")
 add_definitions(-DGTK_TARGET=${GTK_TARGET})

diff --git a/tools/quake3/q3data/video.c b/tools/quake3/q3data/video.c
index 69c6e80ad544435422a5ceffba8cac537dc2c5bc..ae67138e55d15eb8f173013fe6bea77f62e2f8d8 100644 (file)
--- a/tools/quake3/q3data/video.c
+++ b/tools/quake3/q3data/video.c
@@ -596,11 +596,11 @@ static float BTCCompressBlock( float inBlock[4][4][3], unsigned long out[2] ){
        int i;
        int btcQuantizedBlock[4][4];    // values should be [0..3]
        unsigned long encodedEndPoints, encodedBitmap;
-       unsigned int endPoints[2][2];       // endPoints[0] = color start, endPoints[1] = color end
+       unsigned long endPoints[2][2];       // endPoints[0] = color start, endPoints[1] = color end
        int blockY, blockX;
        float error = 0;
        float bestError = 10000000000;
-       unsigned int bestEndPoints[2][2];
+       unsigned long bestEndPoints[2][2];
 
 #if 0
        //