diff --git a/Makefile b/Makefile
index 4dc0aee..54e553f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# if you want to cross compile 
+# if you want to cross compile
 # export PATH=$PATH:/path/to/compiler/bin
 # export CROSS_COMPILE=arm-none-linux-gnueabi-
 # make
@@ -6,10 +6,8 @@
 EXENAME = mcrcon
 PREFIX ?= /usr/local
 
-CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
 EXTRAFLAGS ?= -fstack-protector-strong
 
-CC ?= gcc
 INSTALL = install
 LINKER =
 RM = rm -f
@@ -23,6 +21,8 @@ endif
 ifeq ($(shell uname), Darwin)
 	INSTALL = ginstall
 	CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os
+else
+	CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
 endif
 
 .PHONY: all
diff --git a/mcrcon.c b/mcrcon.c
index 378c12b..8145dea 100644
--- a/mcrcon.c
+++ b/mcrcon.c
@@ -304,9 +304,10 @@ int net_connect(const char *host, const char *port)
 {
 	int sd;
 
-	struct addrinfo hints = {.ai_family = 0};
+	struct addrinfo hints;
 	struct addrinfo *server_info, *p;
 
+	memset(&hints, 0, sizeof hints);
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_protocol = IPPROTO_TCP;