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 93b9f9150fbe542f0a9224408e86e5257b9fba1f..4b25ff2fafd175c4e4e1c5e09df602cf15b965cf 100644 (file)
--- 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 399f828b8e24fe9eb0bda2bebca0c3e47a2c102f..a92c0f23a7a7b0c208e3892b3d4e85349969f0ab 100644 (file)
--- 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_