From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:04 +0000 (-0700)
Subject: C++ goodness continues
X-Git-Tag: stable-10.2.0~528
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6db382eb3d5ccc8044a6fcf9f6b8cab217f882b6;p=thirdparty%2Fopen-vm-tools.git

C++ goodness continues
---

diff --git a/open-vm-tools/lib/include/timeutil.h b/open-vm-tools/lib/include/timeutil.h
index 05ef2f7e5..0cccd5d8c 100644
--- a/open-vm-tools/lib/include/timeutil.h
+++ b/open-vm-tools/lib/include/timeutil.h
@@ -35,6 +35,10 @@
 #include "vm_basic_defs.h"
 #include "vm_assert.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 
 #define MAX_DAYSLEFT     4096
 
@@ -136,4 +140,8 @@ int TimeUtil_GetLocalWindowsTimeZoneIndexAndName(char **ptzName);
 
 time_t TimeUtil_SecondsSinceEpoch(TimeUtil_Date *d); // IN
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif // _TIMEUTIL_H_
diff --git a/open-vm-tools/lib/include/unicodeBase.h b/open-vm-tools/lib/include/unicodeBase.h
index 101507e01..87f94d394 100644
--- a/open-vm-tools/lib/include/unicodeBase.h
+++ b/open-vm-tools/lib/include/unicodeBase.h
@@ -30,15 +30,14 @@
 #define INCLUDE_ALLOW_VMKERNEL
 #include "includeCheck.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdlib.h>
 #include <errno.h>
 #include "util.h"
 #include "unicodeTypes.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 #define UNICODE_SUBSTITUTION_CHAR "\xEF\xBF\xBD"
 
@@ -352,8 +351,8 @@ const char *Unicode_GetStatic(const char *asciiBytes,
    #define UNICODE_RELEASE_UTF16(s) free((utf16_t *)s)
 #endif
 
-#ifdef __cplusplus
-}
+#if defined(__cplusplus)
+}  // extern "C"
 #endif
 
 #endif // _UNICODE_BASE_H_
diff --git a/open-vm-tools/lib/include/unicodeICU.h b/open-vm-tools/lib/include/unicodeICU.h
index 464af2a54..12e7eba84 100644
--- a/open-vm-tools/lib/include/unicodeICU.h
+++ b/open-vm-tools/lib/include/unicodeICU.h
@@ -36,7 +36,7 @@
 
 #include "unicodeBase.h"
 
-#ifdef __cplusplus
+#if defined(__cplusplus)
 extern "C" {
 #endif
 
@@ -96,4 +96,8 @@ char *Unicode_Normalize(const char *str,
 }
 #endif
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif // _UNICODE_ICU_H_
diff --git a/open-vm-tools/lib/include/unicodeOperations.h b/open-vm-tools/lib/include/unicodeOperations.h
index e60e78883..2b0faabd4 100644
--- a/open-vm-tools/lib/include/unicodeOperations.h
+++ b/open-vm-tools/lib/include/unicodeOperations.h
@@ -48,7 +48,7 @@
 #include "unicodeBase.h"
 #include "vm_assert.h"
 
-#ifdef __cplusplus
+#if defined(__cplusplus)
 extern "C" {
 #endif
 
@@ -766,9 +766,8 @@ Unicode_Truncate(const char *str,     // IN
    return Unicode_Substr(str, 0, length);
 }
 
-
-#ifdef __cplusplus
-}
+#if defined(__cplusplus)
+}  // extern "C"
 #endif
 
 #endif // _UNICODE_OPERATIONS_H_
diff --git a/open-vm-tools/lib/include/unicodeTransforms.h b/open-vm-tools/lib/include/unicodeTransforms.h
index 6db21b102..4e762540f 100644
--- a/open-vm-tools/lib/include/unicodeTransforms.h
+++ b/open-vm-tools/lib/include/unicodeTransforms.h
@@ -36,7 +36,7 @@
 
 #include "unicodeTypes.h"
 
-#ifdef __cplusplus
+#if defined(__cplusplus)
 extern "C" {
 #endif
 
@@ -53,8 +53,8 @@ char *Unicode_Trim(const char *str);
 char *Unicode_TrimLeft(const char *str);
 char *Unicode_TrimRight(const char *str);
 
-#ifdef __cplusplus
-}
+#if defined(__cplusplus)
+}  // extern "C"
 #endif
 
 #endif // _UNICODE_TRANSFORMS_H_
diff --git a/open-vm-tools/lib/include/unicodeTypes.h b/open-vm-tools/lib/include/unicodeTypes.h
index 10b5aa95f..606e164a1 100644
--- a/open-vm-tools/lib/include/unicodeTypes.h
+++ b/open-vm-tools/lib/include/unicodeTypes.h
@@ -31,14 +31,13 @@
 #define INCLUDE_ALLOW_VMKERNEL
 #include "includeCheck.h"
 
+#include "vm_basic_types.h"
+#include "vm_assert.h"
 
-#ifdef __cplusplus
+#if defined(__cplusplus)
 extern "C" {
 #endif
 
-#include "vm_basic_types.h"
-#include "vm_assert.h"
-
 typedef ssize_t UnicodeIndex;
 
 /*
@@ -460,8 +459,8 @@ void Unicode_InitW(int argc, utf16_t **wargv, utf16_t **wenvp,
 StringEncoding Unicode_GetCurrentEncoding(void);
 StringEncoding Unicode_ResolveEncoding(StringEncoding encoding);
 
-#ifdef __cplusplus
-}
+#if defined(__cplusplus)
+}  // extern "C"
 #endif
 
 #endif // _UNICODE_TYPES_H_
diff --git a/open-vm-tools/lib/include/userlock.h b/open-vm-tools/lib/include/userlock.h
index 41c9128de..039f94659 100644
--- a/open-vm-tools/lib/include/userlock.h
+++ b/open-vm-tools/lib/include/userlock.h
@@ -19,7 +19,6 @@
 #ifndef _USERLOCK_H_
 #define _USERLOCK_H_
 
-
 #define INCLUDE_ALLOW_USERLEVEL
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
@@ -32,6 +31,10 @@
 #include "mutexRank.h"
 #include "vthreadBase.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 typedef struct MXUserExclLock   MXUserExclLock;
 typedef struct MXUserRecLock    MXUserRecLock;
 typedef struct MXUserRWLock     MXUserRWLock;
@@ -268,4 +271,9 @@ MXUserRecLock       *MXUser_BindMXMutexRec(struct MX_MutexRec *mutex,
 
 struct MX_MutexRec  *MXUser_GetRecLockVmm(MXUserRecLock *lock);
 MX_Rank              MXUser_GetRecLockRank(MXUserRecLock *lock);
+
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif  // _USERLOCK_H_
diff --git a/open-vm-tools/lib/include/util.h b/open-vm-tools/lib/include/util.h
index 01638b782..99d2d72b5 100644
--- a/open-vm-tools/lib/include/util.h
+++ b/open-vm-tools/lib/include/util.h
@@ -50,6 +50,9 @@
 #include "vm_basic_defs.h"
 #include "unicodeTypes.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 /*
  * Define the Util_ThreadID type, and assorted standard bits.
@@ -675,5 +678,8 @@ Util_Memcpy32(void *dst,
 #endif
 }
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
 
 #endif /* UTIL_H */
diff --git a/open-vm-tools/lib/include/uuid.h b/open-vm-tools/lib/include/uuid.h
index 53b4968aa..64f3aafe6 100644
--- a/open-vm-tools/lib/include/uuid.h
+++ b/open-vm-tools/lib/include/uuid.h
@@ -25,14 +25,14 @@
 #ifndef _UUID_H_
 #define _UUID_H_
 
-#ifdef __cplusplus
-extern "C"{
-#endif
-
 #define INCLUDE_ALLOW_USERLEVEL
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #define UUID_SIZE 16
 #define UUID_STRSIZE (2*UUID_SIZE + 1)
 #define UUID_MAXLEN 48
@@ -160,8 +160,8 @@ UUIDStyle UUID_GetStyle(const uint8 *id);
 /* like UUID_GetHostUUID, except gets actual host UUID */
 char *UUID_GetRealHostUUID(void);
 
-#ifdef __cplusplus
-} // extern "C" {
+#if defined(__cplusplus)
+}  // extern "C"
 #endif
 
 #endif
diff --git a/open-vm-tools/lib/include/windowsUtil.h b/open-vm-tools/lib/include/windowsUtil.h
index bb57bd83d..5a1660aa9 100644
--- a/open-vm-tools/lib/include/windowsUtil.h
+++ b/open-vm-tools/lib/include/windowsUtil.h
@@ -32,6 +32,10 @@
 #include "vm_atomic.h"
 #include "unicodeTypes.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #ifdef _WIN32
 
 /* Defines */
@@ -72,4 +76,9 @@ char *W32Util_GetInstalledFilePath64(const char *fileName);
 CRITICAL_SECTION *W32Util_GetSingletonCriticalSection(Atomic_Ptr *csMemory);
 
 #endif // _WIN32
+
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif // WIN32UTIL_H_
diff --git a/open-vm-tools/lib/include/wiper.h b/open-vm-tools/lib/include/wiper.h
index 7ef56e911..6eafb69cd 100644
--- a/open-vm-tools/lib/include/wiper.h
+++ b/open-vm-tools/lib/include/wiper.h
@@ -33,6 +33,10 @@
 #include "vm_basic_types.h"
 #include "dbllnklst.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #define TOOLS_WIPE_CANCEL "Wipe cancelled by user.\n"
 
 typedef enum {
@@ -113,4 +117,8 @@ Wiper_State *Wiper_Start(const WiperPartition *p, unsigned int maxWiperFileSize)
 unsigned char *Wiper_Next(Wiper_State **s, unsigned int *progress);
 unsigned char *Wiper_Cancel(Wiper_State **s);
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif /* _WIPER_H_ */