From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 26 May 2020 22:32:56 +0000 (-0700)
Subject: Changes to common header files not directly related to open-vm-tools.
X-Git-Tag: stable-11.2.0~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dbd9ff2e404957147ad1c22233388302b726d71;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files not directly related to open-vm-tools.

Recongition of MacOS 10.17 (darwin21-64) - pre-enablement on hosts.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 03db1ad9d..31566d1fa 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -215,7 +215,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(DARWIN13_64), BS(DARWIN14_64), \
                               BS(DARWIN15_64), BS(DARWIN16_64), \
                               BS(DARWIN17_64), BS(DARWIN18_64), \
-                              BS(DARWIN19_64), BS(DARWIN20_64)
+                              BS(DARWIN19_64), BS(DARWIN20_64), \
+                              BS(DARWIN21_64)
 
 #define ALLDARWIN             ALLDARWIN32, ALLDARWIN64
 
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 4541a02e4..4dbf27af0 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -105,6 +105,7 @@ extern "C" {
    GOT(GUEST_OS_DARWIN18_64)       /* Mac OS 10.14 */                      \
    GOT(GUEST_OS_DARWIN19_64)       /* Mac OS 10.15 */                      \
    GOT(GUEST_OS_DARWIN20_64)       /* Mac OS 10.16 */                      \
+   GOT(GUEST_OS_DARWIN21_64)       /* Mac OS 10.17 */                      \
    GOT(GUEST_OS_OPENSERVER_5_AND_6)                                        \
    GOT(GUEST_OS_UNIXWARE7)                                                 \
    GOT(GUEST_OS_NETWARE4)                                                  \