From: VMware, Inc <>
Date: Wed, 26 Dec 2012 21:24:44 +0000 (-0800)
Subject: Get rid of ALLOS_EXCEPTDARWINANDVMKERNEL
X-Git-Tag: 2012.12.26-958366~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a744a04a25ebd4408c8bbc915183c50171d9fb95;p=thirdparty%2Fopen-vm-tools.git

Get rid of ALLOS_EXCEPTDARWINANDVMKERNEL

Petr noted that maintaining ALLOS_EXCEPTDARWINANDVMKERNEL
is a bug waiting to happen.  Since it's only used in one place,
we can set the value for ALLOS and then reset it to the default
for DARWIN and VMKERNEL.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 10dadd06c..89910a416 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -163,10 +163,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLECOMSTATION        BS(ECOMSTATION), BS(ECOMSTATION2)
 #define ALLOS2                BS(OS2), ALLECOMSTATION
-#define ALLOS_EXCEPTDARWINANDVMKERNEL                                \
-                              ALLWIN, ALLFREEBSD, ALLSOLARIS,        \
-                              ALLNETWARE, ALLLINUX, ALLECOMSTATION,  \
-                              ALLOS2
 
 /*
  * These constants are generated by GuestInfoGetOSName which is in