Remove definition for "solaris12-64"

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 1d43080fcc62b86e544aeb11ec6e64f84adc3c66..34e520212821fe5d7da83fcf5ca693d881daa578 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -157,7 +157,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLPHOTON             BS(PHOTON_64)
 
 #define ALLSOLARIS11_OR_HIGHER \
-                              BS(SOLARIS11_64), BS(SOLARIS12_64)
+                              BS(SOLARIS11_64)
 
 #define ALLSOLARIS10_OR_HIGHER \
                               BS(SOLARIS10), BS(SOLARIS10_64), \

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 7e3fd6f7b487c65e9393cd610ef06efb69294ca8..b2668f70891b3d0ecfed8e6c2a916a29463ce357 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -83,7 +83,6 @@ extern "C" {
    GOT(GUEST_OS_SOLARIS10)                                                 \
    GOT(GUEST_OS_SOLARIS10_64)                                              \
    GOT(GUEST_OS_SOLARIS11_64)                                              \
-   GOT(GUEST_OS_SOLARIS12_64)                                              \
    GOT(GUEST_OS_DARWIN9)           /* Mac OS 10.5 */                       \
    GOT(GUEST_OS_DARWIN9_64)                                                \
    GOT(GUEST_OS_DARWIN10)          /* Mac OS 10.6 */                       \
@@ -225,7 +224,6 @@ extern "C" {
    GOSL(STR_OS_SOLARIS "10",                 GUEST_OS_SOLARIS10,              "solaris.iso")          \
    GOSL(STR_OS_SOLARIS "10-64",              GUEST_OS_SOLARIS10_64,           "solaris.iso")          \
    GOSL(STR_OS_SOLARIS "11-64",              GUEST_OS_SOLARIS11_64,           "solaris.iso")          \
-   GOSL(STR_OS_SOLARIS "12-64",              GUEST_OS_SOLARIS12_64,           "solaris.iso")          \
    GOSL(STR_OS_SOLARIS "6",                  GUEST_OS_SOLARIS_6_AND_7,        "solaris.iso")          \
    GOSL(STR_OS_SOLARIS "7",                  GUEST_OS_SOLARIS_6_AND_7,        "solaris.iso")          \
    GOSL(STR_OS_SOLARIS "8",                  GUEST_OS_SOLARIS8,               "solaris.iso")          \
@@ -487,7 +485,6 @@ extern "C" {
    GOKM("solaris10",                            solaris10Guest,          TRUE) \
    GOKM("solaris10-64",                         solaris10_64Guest,       TRUE) \
    GOKM("solaris11-64",                         solaris11_64Guest,       TRUE) \
-   GOKM("solaris12-64",                         solaris12_64Guest,       TRUE) \
    /* macOS guests */ \
    GOKM("darwin",                               darwinGuest,             TRUE) \
    GOKM("darwin-64",                            darwin64Guest,           TRUE) \