From: VMware, Inc <>
Date: Tue, 24 Aug 2010 18:47:48 +0000 (-0700)
Subject: lib/log: moved defines where they belong
X-Git-Tag: 2010.08.24-292196~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc0b010c915feabc5b547767cf51605f987d8a60;p=thirdparty%2Fopen-vm-tools.git

lib/log: moved defines where they belong

These defines have nothing to do with the log. Put in the "right"
place.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/log.h b/open-vm-tools/lib/include/log.h
index 93b9f9150..4b25ff2fa 100644
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -157,18 +157,6 @@ void Log_LevelV(int level,
 void GuestLog_Init(void);
 void GuestLog_Log(const char *fmt, ...) PRINTF_DECL(1, 2);
 
-// I left DEFAULT_DEBUG in here because the vmx is still using it for now
-#if defined(VMX86_DEVEL)
-#define DEFAULT_MONITOR    "debug"
-#define DEFAULT_DEBUG      1
-#elif defined(VMX86_BETA)
-#define DEFAULT_MONITOR    "debug"
-#define DEFAULT_DEBUG      1
-#else
-#define DEFAULT_MONITOR    "release"
-#define DEFAULT_DEBUG      0
-#endif
-
 
 /*
  * How many old log files to keep around.
diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 399f828b8..a92c0f23a 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -686,4 +686,16 @@ typedef int pid_t;
 #define NONCLIENTMETRICSINFO_V1_SIZE CCSIZEOF_STRUCT(NONCLIENTMETRICS, \
                                                      lfMessageFont)
 
+// I left DEFAULT_DEBUG in here because the vmx is still using it for now
+#if defined(VMX86_DEVEL)
+#define DEFAULT_MONITOR    "debug"
+#define DEFAULT_DEBUG      1
+#elif defined(VMX86_BETA)
+#define DEFAULT_MONITOR    "debug"
+#define DEFAULT_DEBUG      1
+#else
+#define DEFAULT_MONITOR    "release"
+#define DEFAULT_DEBUG      0
+#endif
+
 #endif // ifndef _VM_BASIC_DEFS_H_