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

Update bsdfmt.h license

2016 now
---

diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
index 289bc062e..27bf03d28 100644
--- a/open-vm-tools/lib/include/asyncsocket.h
+++ b/open-vm-tools/lib/include/asyncsocket.h
@@ -49,6 +49,10 @@
 #define INCLUDE_ALLOW_USERLEVEL
 #include "includeCheck.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #ifdef __APPLE__
 #include <TargetConditionals.h>
 #endif
@@ -552,5 +556,9 @@ const char * stristr(const char *s, const char *find);
       }                                                               \
    } while(0)
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif // __ASYNC_SOCKET_H__
 
diff --git a/open-vm-tools/lib/include/auth.h b/open-vm-tools/lib/include/auth.h
index 21ac75f82..afc86d476 100644
--- a/open-vm-tools/lib/include/auth.h
+++ b/open-vm-tools/lib/include/auth.h
@@ -19,6 +19,10 @@
 #ifndef _AUTH_H_
 #define _AUTH_H_
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 /*
  * auth.h --
  *
@@ -70,4 +74,8 @@ AuthToken Auth_AuthenticateUser(const char *user, const char *pass);
 
 void Auth_CloseToken(AuthToken token);
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif
diff --git a/open-vm-tools/lib/include/backdoor.h b/open-vm-tools/lib/include/backdoor.h
index 751115544..22fe36866 100644
--- a/open-vm-tools/lib/include/backdoor.h
+++ b/open-vm-tools/lib/include/backdoor.h
@@ -40,6 +40,10 @@
 #ifndef _BACKDOOR_H_
 #define _BACKDOOR_H_
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #include "vm_basic_types.h"
 #include "vm_assert.h"
 
@@ -57,4 +61,8 @@ Backdoor_HbOut(Backdoor_proto_hb *bp); // IN/OUT
 void
 Backdoor_HbIn(Backdoor_proto_hb *bp); // IN/OUT
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif /* _BACKDOOR_H_ */
diff --git a/open-vm-tools/lib/include/base64.h b/open-vm-tools/lib/include/base64.h
index 9d4cfcb8d..7fdf65752 100644
--- a/open-vm-tools/lib/include/base64.h
+++ b/open-vm-tools/lib/include/base64.h
@@ -26,6 +26,10 @@
 #ifndef _BASE64_H
 #define _BASE64_H
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 Bool Base64_Encode(uint8 const *src, size_t srcLength,
                    char *target, size_t targSize,
                    size_t *dataLength);
@@ -42,4 +46,8 @@ Bool Base64_EasyEncode(const uint8 *src, size_t srcLength, char **target);
 Bool Base64_EasyDecode(const char *src, uint8 **target, size_t *targSize);
 Bool Base64_DecodeFixed(const char *src, char *outBuf, size_t outBufSize);
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif
diff --git a/open-vm-tools/lib/include/bsdfmt.h b/open-vm-tools/lib/include/bsdfmt.h
index 108edb385..6562828c6 100644
--- a/open-vm-tools/lib/include/bsdfmt.h
+++ b/open-vm-tools/lib/include/bsdfmt.h
@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright 2008-2014 VMware, Inc.  All rights reserved. -- VMware Confidential
+ * Copyright 2008-2016 VMware, Inc.  All rights reserved. -- VMware Confidential
  * **********************************************************/
 
 /*
@@ -47,6 +47,9 @@
 #define INCLUDE_ALLOW_USERLEVEL
 #include "includeCheck.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 #ifdef _WIN32 // {
 
@@ -206,5 +209,8 @@ extern char zeroes[PADSIZE];
 extern const char xdigs_lower[17];
 extern const char xdigs_upper[17];
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
 
 #endif // ifndef _BSDFMT_H_
diff --git a/open-vm-tools/lib/include/circList.h b/open-vm-tools/lib/include/circList.h
index e01d20520..0618a38a8 100644
--- a/open-vm-tools/lib/include/circList.h
+++ b/open-vm-tools/lib/include/circList.h
@@ -32,6 +32,11 @@
 #define INCLUDE_ALLOW_MODULE
 #define INCLUDE_ALLOW_VMKERNEL
 #include "includeCheck.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #include "vmware.h"
 
 typedef struct ListItem {
@@ -467,4 +472,8 @@ CircList_Size(ListItem *head)     // IN
    return ret;
 }
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif /* _CIRCLIST_H_ */
diff --git a/open-vm-tools/lib/include/codeset.h b/open-vm-tools/lib/include/codeset.h
index 6886d3d20..1bdac0d03 100644
--- a/open-vm-tools/lib/include/codeset.h
+++ b/open-vm-tools/lib/include/codeset.h
@@ -49,6 +49,9 @@
 #ifndef __CODESET_H__
 #   define __CODESET_H__
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 #include "vm_basic_types.h"
 #include "vm_assert.h"
@@ -579,4 +582,8 @@ CodeSet_Utf16FindCodePointBoundary(const char *buf, // IN
    return origOffset * 2;
 }
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif /* __CODESET_H__ */
diff --git a/open-vm-tools/lib/include/config.h b/open-vm-tools/lib/include/config.h
index 4d3900489..95aa59871 100644
--- a/open-vm-tools/lib/include/config.h
+++ b/open-vm-tools/lib/include/config.h
@@ -23,10 +23,13 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #include "vm_basic_types.h"
 #include "preference.h"
 
-
 /*
  * Well-known configuration variable names
  */
@@ -123,4 +126,8 @@ Bool Config_GetDataFileKeys(struct KeySafeUserRing **parentKeys,
 Bool Config_TriToBool(Bool boolDefaultValue,
                       int32 triValue);
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif // _CONFIG_H_
diff --git a/open-vm-tools/lib/include/cryptoError.h b/open-vm-tools/lib/include/cryptoError.h
index 269e42920..8a189230f 100644
--- a/open-vm-tools/lib/include/cryptoError.h
+++ b/open-vm-tools/lib/include/cryptoError.h
@@ -29,6 +29,10 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #include "vmware.h"
 
 typedef int CryptoError;
@@ -89,4 +93,8 @@ CryptoError_IsFailure(CryptoError error)
    return (CRYPTO_ERROR_SUCCESS != error);
 }
 
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
 #endif /* cryptoError.h */