Fix compile error when compiling without WIN32_GUI due to defining a …

…"printf" macro
RElesgoe · Aug 23, 2016 · 795964d · 795964d
1 parent 159e078
commit 795964d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/bnetd/cmdline.cpp b/src/bnetd/cmdline.cpp
@@ -28,7 +28,6 @@
 #endif
 #ifdef WIN32_GUI
 # include "common/gui_printf.h"
-# define printf gui_lvprintf
 #endif
 #include "compat/strcasecmp.h"
 #include "common/eventlog.h"
@@ -255,7 +254,11 @@ namespace pvpgn
 
 			conf_set_bool(&tmp, valstr, 0);
 			if (tmp) {
-				printf(eventlog_level_info, PVPGN_SOFTWARE" version " PVPGN_VERSION "\n");
+#ifdef WIN32_GUI
+				gui_lvprintf(eventlog_level_info, PVPGN_SOFTWARE" version " PVPGN_VERSION "\n");
+#else
+				std::printf(PVPGN_SOFTWARE" version " PVPGN_VERSION "\n");
+#endif
 				exitflag = 1;
 			}
 

diff --git a/src/bnetd/main.cpp b/src/bnetd/main.cpp
@@ -37,7 +37,6 @@
 #endif
 #ifdef WIN32_GUI
 # include "common/gui_printf.h"
-# define printf gui_lvprintf
 #endif
 
 #include "compat/stdfileno.h"
@@ -503,12 +502,21 @@ void pvpgn_greeting()
 		eventlog(eventlog_level_info, __FUNCTION__, "uname() failed");
 	}
 
-	printf(eventlog_level_info, "You are currently running " PVPGN_SOFTWARE " " PVPGN_VERSION "\n");
-	printf(eventlog_level_info, "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n");
-	printf(eventlog_level_info, "If you need support:\n");
-	printf(eventlog_level_info, " * Create an issue at https://github.com/pvpgn/pvpgn-server\n");
-	printf(eventlog_level_info, "\nServer is now running.\n");
-	printf(eventlog_level_info, "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n");
+#ifdef WIN32_GUI
+	gui_lvprintf(eventlog_level_info, "You are currently running " PVPGN_SOFTWARE " " PVPGN_VERSION "\n");
+	gui_lvprintf(eventlog_level_info, "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n");
+	gui_lvprintf(eventlog_level_info, "If you need support:\n");
+	gui_lvprintf(eventlog_level_info, " * Create an issue at https://github.com/pvpgn/pvpgn-server\n");
+	gui_lvprintf(eventlog_level_info, "\nServer is now running.\n");
+	gui_lvprintf(eventlog_level_info, "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n");
+#else
+	std::printf("You are currently running " PVPGN_SOFTWARE " " PVPGN_VERSION "\n");
+	std::printf("=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n");
+	std::printf("If you need support:\n");
+	std::printf(" * Create an issue at https://github.com/pvpgn/pvpgn-server\n");
+	std::printf("\nServer is now running.\n");
+	std::printf("=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n");
+#endif
 
 	return;
 }