diff --git a/desmume/compile b/desmume/compile
index 531136b06..a85b723c7 100755
--- a/desmume/compile
+++ b/desmume/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/desmume/src/GPU_osd.cpp b/desmume/src/GPU_osd.cpp
index 452c52f92..6d532a2d7 100644
--- a/desmume/src/GPU_osd.cpp
+++ b/desmume/src/GPU_osd.cpp
@@ -36,6 +36,8 @@
 
 #ifdef _MSC_VER
 #include <Windows.h>
+#else
+#include <sys/time.h>
 #endif
 
 bool HudEditorMode = false;
@@ -531,10 +533,9 @@ void DrawHUD()
 		time_t tv_usec = time64 % 1000000;
 		hudTimer = ((s64)tv_sec * 1000) + ((s64)tv_usec/1000);
 	#else
-		time_t t;
+		struct timeval t;
 		gettimeofday (&t, NULL);
-		result->tv_sec = r.tv_sec;
-		result->tv_usec = r.tv_usec;
+		hudTimer = ((s64)t.tv_sec * 1000) + ((s64)t.tv_usec/1000);
 	#endif
 
 	if (HudEditorMode)
diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp
index 7230ad479..89263afe1 100644
--- a/desmume/src/commandline.cpp
+++ b/desmume/src/commandline.cpp
@@ -198,9 +198,9 @@ bool CommandLine::parse(int argc,char **argv)
 			{ "spu-synch", no_argument, &_spu_sync_mode, 1 },
 			{ "spu-method", required_argument, nullptr, OPT_SPU_METHOD },
 			#ifndef HOST_WINDOWS 
-				{ "disable-sound", no_argument, &disable_sound, 1}
-				{ "disable-limiter", no_argument, &disable_limiter, 1}
-				{ "nojoy", no_argument, &_commandline_linux_nojoy, 1}
+				{ "disable-sound", no_argument, &disable_sound, 1},
+				{ "disable-limiter", no_argument, &disable_limiter, 1},
+				{ "nojoy", no_argument, &_commandline_linux_nojoy, 1},
 			#endif
 
 			//sync settings
diff --git a/desmume/src/wifi.cpp b/desmume/src/wifi.cpp
index 27cc5124d..cd4b3a356 100644
--- a/desmume/src/wifi.cpp
+++ b/desmume/src/wifi.cpp
@@ -320,9 +320,9 @@ WifiComInterface* wifiCom;
 
 #if (WIFI_LOGGING_LEVEL >= 1)
 	#if WIFI_LOG_USE_LOGC
-		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__);
+		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__);
 	#else
-		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__);
+		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__);
 	#endif
 #else
 #define WIFI_LOG(level, ...) {}