M src/platform/qt/Window.cpp → src/platform/qt/Window.cpp

@@ -7,8 +7,8 @@ #include <QMenuBar>
 #include <QStackedLayout>
 
 #include "GameController.h"
-#include "GDBWindow.h"
 #include "GDBController.h"
+#include "GDBWindow.h"
 #include "LoadSaveState.h"
 #include "LogView.h"
 

M src/platform/qt/Window.h → src/platform/qt/Window.h

@@ -8,6 +8,7 @@ extern "C" {
 #include "gba.h"
 }
 
+#include "GDBController.h"
 #include "Display.h"
 #include "LoadSaveState.h"
 
@@ -16,7 +17,6 @@
 namespace QGBA {
 
 class GameController;
-class GDBController;
 class LogView;
 class WindowBackground;
 

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

@@ -48,10 +48,9 @@
 	struct sockaddr_in bindInfo = {
 		.sin_family = AF_INET,
 		.sin_port = htons(port),
-		.sin_addr = {
-			.s_addr = htonl(bindAddress)
-		}
+		.sin_addr = { 0 }
 	};
+	bindInfo.sin_addr.s_addr = htonl(bindAddress);
 	int err = bind(sock, (const struct sockaddr*) &bindInfo, sizeof(struct sockaddr_in));
 	if (err) {
 		close(sock);
@@ -69,10 +68,9 @@
 	struct sockaddr_in bindInfo = {
 		.sin_family = AF_INET,
 		.sin_port = htons(port),
-		.sin_addr = {
-			.s_addr = htonl(destinationAddress)
-		}
+		.sin_addr = { 0 }
 	};
+	bindInfo.sin_addr.s_addr = htonl(destinationAddress);
 	int err = connect(sock, (const struct sockaddr*) &bindInfo, sizeof(struct sockaddr_in));
 	if (err) {
 		close(sock);