M src/debugger/memory-debugger.c → src/debugger/memory-debugger.c

@@ -40,7 +40,7 @@ #define CREATE_WATCHPOINT_SHIM(NAME, WIDTH, RETURN, TYPES, ARGS...) \
 	static RETURN ARMDebuggerShim_ ## NAME TYPES { \
 		struct ARMDebugger* debugger; \
 		FIND_DEBUGGER(debugger, cpu); \
-		struct DebuggerEntryInfo info = { }; \
+		struct DebuggerEntryInfo info; \
 		if (_checkWatchpoints(debugger, address, &info, WIDTH)) { \
 			ARMDebuggerEnter(debugger, DEBUGGER_ENTER_WATCHPOINT, &info); \
 		} \
@@ -63,7 +63,7 @@ base += offset; \
 		} \
 		unsigned i; \
 		for (i = 0; i < popcount; ++i) { \
-			struct DebuggerEntryInfo info = { }; \
+			struct DebuggerEntryInfo info; \
 			if (_checkWatchpoints(debugger, base + 4 * i, &info, 4)) { \
 				ARMDebuggerEnter(debugger, DEBUGGER_ENTER_WATCHPOINT, &info); \
 			} \

M src/util/socket.h → src/util/socket.h

@@ -186,7 +186,7 @@ fd_set eset;
 	FD_ZERO(&rset);
 	FD_ZERO(&wset);
 	FD_ZERO(&eset);
-	int i;
+	Socket i;
 	Socket maxFd = 0;
 	if (reads) {
 		for (i = 0; i < nSockets; ++i) {