From: VMware, Inc <>
Date: Thu, 22 Dec 2011 00:47:01 +0000 (-0800)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2011.12.20-562307~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=225bae6501f36ceb9eaed28567ed6243e5eea934;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

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

diff --git a/open-vm-tools/lib/include/msgid.h b/open-vm-tools/lib/include/msgid.h
index bfb8dc5aa..59503d1b8 100644
--- a/open-vm-tools/lib/include/msgid.h
+++ b/open-vm-tools/lib/include/msgid.h
@@ -29,6 +29,7 @@
 #define INCLUDE_ALLOW_VMCORE
 #define INCLUDE_ALLOW_VMKERNEL
 #include "includeCheck.h"
+#include "msgidDefs.h"
 
 #include "vm_basic_defs.h"
 
@@ -37,32 +38,6 @@
 #endif
 
 
-/*
- * Message ID macros
- *
- * Use as in
- *	Msg_Append(MSGID(file.openFailed) "Failed to open file %s: %s.\n"
- *		   fileName, Msg_ErrString())
- *	Msg_Append(MSGID(mks.powerOnFailed) "Power on failed.\n")
- * or
- *	Msg_Hint(TRUE, HINT_OK,
- *		 MSGID(mks.noDGA) "No full screen mode.\n").
- *
- * Don't make MSG_MAGIC_LEN (sizeof MSG_MAGIC - 1), since
- * that may cause the string to be in the object file, even
- * when it's not used at run time.  And we are trying
- * to avoid littering the output with the magic string.
- *
- * -- edward
- */
-
-#define MSG_MAGIC	"@&!*@*@"
-#define MSG_MAGIC_LEN	7
-#define MSGID(id)	MSG_MAGIC "(msg." #id ")"
-#define MSG_BUTTON_ID "(button."
-#define MSG_BUTTON_ID_LEN 8
-#define BUTTONID(id)	MSG_MAGIC MSG_BUTTON_ID #id ")"
-
 // the X hides MSG_MAGIC so it won't appear in the object file
 #define MSG_MAGICAL(s)	(strncmp(s, MSG_MAGIC"X", MSG_MAGIC_LEN) == 0)