commit: c03d98c3ed5ce0336044e36afcee4abf806d5fac
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Fri Oct 10 01:55:55 2014 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Fri Oct 10 01:55:55 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=c03d98c3
a better approach to dealing with deprecated macro redefinition
---
.../files/271-3.10-03-deprecated.patch | 75 ++++++++++------------
1 file changed, 35 insertions(+), 40 deletions(-)
diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
index 862ef97..3a9f785 100644
--- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
@@ -1,90 +1,85 @@
diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
---- vmblock-only/shared/vm_assert.h 2013-11-05 23:33:27.000000000 -0500
-+++ vmblock-only.new/shared/vm_assert.h 2014-10-07 18:13:59.583815971
-0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmblock-only/shared/vm_assert.h 2014-10-09 21:50:54.221159088 -0400
++++ vmblock-only.new/shared/vm_assert.h 2014-10-09 21:53:04.612166156
-0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE(
\
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
---- vmci-only/shared/vm_assert.h 2013-11-05 23:33:27.000000000 -0500
-+++ vmci-only.new/shared/vm_assert.h 2014-10-07 18:14:18.470816995 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmci-only/shared/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vmci-only.new/shared/vm_assert.h 2014-10-09 21:52:52.348165492 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE(
\
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
---- vmmon-only/include/vm_assert.h 2013-11-06 00:40:51.000000000 -0500
-+++ vmmon-only.new/include/vm_assert.h 2014-10-07 18:14:12.118816650 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmmon-only/include/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vmmon-only.new/include/vm_assert.h 2014-10-09 21:52:36.877164653 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE(
\
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
---- vmnet-only/vm_assert.h 2013-11-06 00:40:52.000000000 -0500
-+++ vmnet-only.new/vm_assert.h 2014-10-07 18:14:05.167816273 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmnet-only/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vmnet-only.new/vm_assert.h 2014-10-09 21:52:57.736165784 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE(
\
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
---- vsock-only/shared/vm_assert.h 2013-11-05 23:33:27.000000000 -0500
-+++ vsock-only.new/shared/vm_assert.h 2014-10-07 18:14:24.454817319 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vsock-only/shared/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vsock-only.new/shared/vm_assert.h 2014-10-09 21:52:45.352165112 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE(
\
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
