From: Oliver Kurth Date: Fri, 15 Sep 2017 18:23:00 +0000 (-0700) Subject: Change "OS X" to "macOS" in the GOSTable. X-Git-Tag: stable-10.2.0~572 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf015ea15ad08bd5863c78b3a2cd270f152ce723;p=thirdparty%2Fopen-vm-tools.git Change "OS X" to "macOS" in the GOSTable. Apple rebranded, so react accordingly. Also fix a misspelled message. --- diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h index ef202e3c5..1e155bd5c 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h @@ -182,7 +182,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define ALLDARWIN64 BS(DARWIN9_64), BS(DARWIN10_64), \ BS(DARWIN11_64), BS(DARWIN12_64), \ BS(DARWIN13_64), BS(DARWIN14_64), \ - BS(DARWIN15_64), BS(DARWIN16_64) + BS(DARWIN15_64), BS(DARWIN16_64), \ + BS(DARWIN17_64) #define ALLDARWIN ALLDARWIN32, ALLDARWIN64 #define ALL64 ALLWIN64, ALLLINUX64, BS(SOLARIS10_64), \ BS(FREEBSD_64), ALLDARWIN64, \ diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index cccc108bd..330131168 100644 --- a/open-vm-tools/lib/include/guest_os_tables.h +++ b/open-vm-tools/lib/include/guest_os_tables.h @@ -88,6 +88,7 @@ GOT(GUEST_OS_DARWIN14_64) /* Mac OS 10.10 */ \ GOT(GUEST_OS_DARWIN15_64) /* Mac OS 10.11 */ \ GOT(GUEST_OS_DARWIN16_64) /* Mac OS 10.12 */ \ + GOT(GUEST_OS_DARWIN17_64) /* Mac OS 10.13 */ \ GOT(GUEST_OS_OPENSERVER_5_AND_6) \ GOT(GUEST_OS_UNIXWARE7) \ GOT(GUEST_OS_NETWARE4) \ @@ -135,6 +136,7 @@ GOSL(STR_OS_MACOS "14-64", GUEST_OS_DARWIN14_64, "darwin.iso") \ GOSL(STR_OS_MACOS "15-64", GUEST_OS_DARWIN15_64, "darwin.iso") \ GOSL(STR_OS_MACOS "16-64", GUEST_OS_DARWIN16_64, "darwin.iso") \ + GOSL(STR_OS_MACOS "17-64", GUEST_OS_DARWIN16_64, "darwin.iso") \ GOSL(STR_OS_DEBIAN_10, GUEST_OS_DEBIAN, "linux.iso") \ GOSL(STR_OS_DEBIAN_10 "-64", GUEST_OS_DEBIAN_64, "linux.iso") \ GOSL(STR_OS_DEBIAN_4, GUEST_OS_DEBIAN, "linuxPreGlibc25.iso") \