all repos — mgba @ e29b30560ef053809da73fc34aed813267fbc6fb

mGBA Game Boy Advance Emulator

All: Disable missing-field-initializers warning
Jeffrey Pfau jeffrey@endrift.com
Sat, 17 Sep 2016 01:34:07 -0700
commit

e29b30560ef053809da73fc34aed813267fbc6fb

parent

0ac6f0862c61b1d49a1cfb97c8189dc763085b2e

5 files changed, 2 insertions(+), 10 deletions(-)

jump to
M CMakeLists.txt → CMakeLists.txt 
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 project(mGBA C)
 set(BINARY_NAME mgba CACHE INTERNAL "Name of output binaries")
 if(NOT MSVC)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-missing-field-initializers -std=c99")
 else()
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4003 /wd4244 /wd4146")
 endif()
M src/platform/3ds/main.c → src/platform/3ds/main.c 
@@ -742,8 +742,6 @@ _drawStart, _drawEnd,
 			_pollInput, _pollCursor,
 			_batteryState,
 			_guiPrepare, _guiFinish,
-
-			GUI_PARAMS_TRAIL
 		},
 		.keySources = (struct GUIInputKeys[]) {
 			{
M src/platform/psp2/main.c → src/platform/psp2/main.c 
@@ -92,8 +92,6 @@ font, "ux0:data", _drawStart, _drawEnd,
 			_pollInput, _pollCursor,
 			_batteryState,
 			0, 0,
-
-			GUI_PARAMS_TRAIL
 		},
 		.configExtra = (struct GUIMenuItem[]) {
 			{
M src/platform/wii/main.c → src/platform/wii/main.c 
@@ -310,8 +310,6 @@ _drawStart, _drawEnd,
 			_pollInput, _pollCursor,
 			0,
 			_guiPrepare, 0,
-
-			GUI_PARAMS_TRAIL
 		},
 		.keySources = (struct GUIInputKeys[]) {
 			{
M src/util/gui.h → src/util/gui.h 
@@ -30,7 +30,7 @@ GUI_INPUT_MAX = 0x20
 };
 
 enum GUICursorState {
-	GUI_CURSOR_NOT_PRESENT,
+	GUI_CURSOR_NOT_PRESENT = 0,
 	GUI_CURSOR_UP,
 	GUI_CURSOR_DOWN,
 	GUI_CURSOR_CLICKED,

@@ -75,8 +75,6 @@ // Directories
 	char currentPath[PATH_MAX];
 	size_t fileIndex;
 };
-
-#define GUI_PARAMS_TRAIL {0}, {}, GUI_CURSOR_NOT_PRESENT, 0, 0, "", 0
 
 void GUIInit(struct GUIParams* params);
 void GUIPollInput(struct GUIParams* params, uint32_t* newInput, uint32_t* heldInput);