Rename unityPlatformWin32.c to have a .cpp suffix.

Add 'extern "C"' constructs where required for name mangling, and fix some (now required) type casts.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/include/unity.h b/open-vm-tools/lib/include/unity.h
index d81b6f536d503e056f471ffcd6f1e32414ee4681..7fe9ead9524cb53ef83df296b8dde4407b3399d4 100644 (file)
--- a/open-vm-tools/lib/include/unity.h
+++ b/open-vm-tools/lib/include/unity.h
@@ -81,6 +81,10 @@ typedef struct UnityVirtualDesktopArray {
 /* Forward reference. */
 typedef struct DesktopSwitchCallbackManager DesktopSwitchCallbackManager;
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 void Unity_Init(GuestApp_Dict *conf,
                 int *blockedWnd,
                 DesktopSwitchCallbackManager *desktopSwitchCallbackMgr);
@@ -98,4 +102,8 @@ void Unity_LocalToUnityPoint(UnityPoint *unityPt, UnityPoint *localPt);
 HWND Unity_GetHwndFromUnityId(UnityWindowId id);
 #endif
 
+#ifdef __cplusplus
+};
+#endif // __cplusplus
+
 #endif

diff --git a/open-vm-tools/lib/unity/unityPlatform.h b/open-vm-tools/lib/unity/unityPlatform.h
index a01c4d4569185feae48d128f25dbe9a6b1fa3ede..a283a6179462be8a561e028f913d2a3f7734f4bb 100644 (file)
--- a/open-vm-tools/lib/unity/unityPlatform.h
+++ b/open-vm-tools/lib/unity/unityPlatform.h
@@ -54,6 +54,9 @@ typedef struct _UnityPlatform UnityPlatform;
  * Implemented by unityPlatform[Win32|X11|Cocoa (ha!)].c
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
 Bool UnityPlatformIsSupported(void);
 UnityPlatform *UnityPlatformInit(UnityWindowTracker *tracker,
                                  UnityUpdateChannel *updateChannel,
@@ -134,4 +137,8 @@ Bool UnityUpdateChannelInit(UnityUpdateChannel *updateChannel);
 void UnityUpdateChannelCleanup(UnityUpdateChannel *updateChannel);
 Bool UnitySendUpdates(UnityUpdateChannel *updateChannel);
 
+#ifdef __cplusplus
+};
+#endif // __cplusplus
+
 #endif