From e2900e168ea677efd1cdfac7fc91fb1fc071a269 Mon Sep 17 00:00:00 2001 From: TimePath Date: Mon, 7 Aug 2017 18:39:54 +1000 Subject: [PATCH] Remove -Wno-incompatible-pointer-types --- CMakeLists.txt | 2 -- tools/quake3/q3data/video.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a8f62c9..bf5e235e 100644 --- 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 69c6e80a..ae67138e 100644 --- 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 // -- 2.39.2