Remove extern "C"

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 3fa7058cd61637e3e1ce4aa9348b001d3580c1e3..2ecc9c2aa3560fbd8d54d6ebf98727a10dfc930b 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -27,6 +27,10 @@
 #include "vm_basic_types.h"
 #include "guest_os_tables.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /*
  * There's no practical max to the number of guests that can be defined in
  * the list below (guest IDs are limited to 2^32), but there is a maximum
@@ -507,4 +511,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_64BIT_SUFFIX_FULL " (64 bit)"
 #define STR_OS_EMPTY ""
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 48e0f3c807ed2f6c43db402b80ac5eb14cf210da..2954a7b086492353107fb6378d633a5de475edc3 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -24,6 +24,10 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #define GUEST_OS_TYPE_GEN                                                  \
    GOT(GUEST_OS_ANY)                                                       \
    GOT(GUEST_OS_DOS)                                                       \
@@ -294,4 +298,8 @@
    GOSL(STR_OS_WIN_XP_PRO,                   GUEST_OS_WINXP,                  "winPreVista.iso")      \
    GOSL(STR_OS_WIN_XP_PRO_X64,               GUEST_OS_WINXPPRO_64,            "winPreVista.iso")      \
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif