From 9a38a9da20c898c4c21e84e1cf4f97c5b63f6a87 Mon Sep 17 00:00:00 2001 From: "Scott M. Kroll" Date: Mon, 14 Jul 2014 11:25:10 -0400 Subject: [PATCH 2/5] Conditionally define g_info macro * Some versions of GLib define this macro. --- open-vm-tools/lib/include/vmware/tools/log.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/open-vm-tools/lib/include/vmware/tools/log.h b/open-vm-tools/lib/include/vmware/tools/log.h index 526b7c2..fa7deb4 100644 --- a/lib/include/vmware/tools/log.h +++ b/lib/include/vmware/tools/log.h @@ -121,6 +121,7 @@ # define FUNC __FUNCTION__ #endif +#ifndef g_info /* ******************************************************************************* * g_info -- */ /** @@ -135,7 +136,7 @@ */ #define g_info(fmt, ...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, fmt, ## __VA_ARGS__) - +#endif /* ******************************************************************************* -- 2.0.1