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

Remove extern "C"
---

diff --git a/open-vm-tools/lib/message/message.c b/open-vm-tools/lib/message/message.c
index 3fb614713..6465ff4c9 100644
--- a/open-vm-tools/lib/message/message.c
+++ b/open-vm-tools/lib/message/message.c
@@ -51,6 +51,10 @@
  *    such an operation. This layer takes care of retrying those operations.
  */
 
+#include "backdoor_def.h"
+#include "guest_msg_def.h"
+#include "backdoor.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -63,9 +67,6 @@ extern "C" {
 #   include "debug.h"
 #endif
 
-#include "backdoor_def.h"
-#include "guest_msg_def.h"
-#include "backdoor.h"
 #include "message.h"
 
 
diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
index cef64c1b2..5f22083cb 100644
--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
@@ -73,12 +73,12 @@
 #include "dndFileList.hh"
 #include "guestDnDCPMgr.hh"
 #include "tracer.hh"
+#include "vmblock.h"
+#include "file.h"
+#include "dnd.h"
+#include "dndMsg.h"
 
 extern "C" {
-   #include "vmblock.h"
-   #include "file.h"
-   #include "dnd.h"
-   #include "dndMsg.h"
    #include "dndClipboard.h"
    #include "cpName.h"
    #include "cpNameUtil.h"
diff --git a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
index 231479a99..1f2a7f55e 100644
--- a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
@@ -42,16 +42,17 @@ extern "C" {
 #include "copyPasteCompat.h"
 #include "cpName.h"
 #include "cpNameUtil.h"
-#include "dnd.h"
 #include "dndClipboard.h"
-#include "dndMsg.h"
-#include "file.h"
 #include "hgfsUri.h"
-#include "hostinfo.h"
 #include "rpcout.h"
-#include "vmblock.h"
 }
 
+#include "dnd.h"
+#include "dndMsg.h"
+#include "hostinfo.h"
+#include "file.h"
+#include "vmblock.h"
+
 /* IsXExtensionPointer may be not defined with old Xorg. */
 #ifndef IsXExtensionPointer
 #define IsXExtensionPointer 4
diff --git a/open-vm-tools/services/plugins/dndcp/dndcp.cpp b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
index 645bc2544..024e96161 100644
--- a/open-vm-tools/services/plugins/dndcp/dndcp.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
@@ -27,8 +27,9 @@
  * CopyPasteDnDImpl.
  */
 
-extern "C" {
 #include "vmware.h"
+
+extern "C" {
 #include "vmware/guestrpc/tclodefs.h"
 #include "vmware/tools/plugin.h"
 #include "vmware/tools/utils.h"
diff --git a/open-vm-tools/services/plugins/dndcp/pointer.cpp b/open-vm-tools/services/plugins/dndcp/pointer.cpp
index 4c74f74ae..4e181bb75 100644
--- a/open-vm-tools/services/plugins/dndcp/pointer.cpp
+++ b/open-vm-tools/services/plugins/dndcp/pointer.cpp
@@ -35,13 +35,12 @@ extern "C" {
 }
 
 #include "copyPasteDnDWrapper.h"
-
 #include "pointer.h"
 #include "vmware/tools/utils.h"
+#include "vm_assert.h"
+#include "backdoor_def.h"
 
 extern "C" {
-   #include "vm_assert.h"
-   #include "backdoor_def.h"
    #include "backdoor.h"
    #include "rpcvmx.h"
 }