Remove extern "C"

diff --git a/open-vm-tools/lib/message/message.c b/open-vm-tools/lib/message/message.c
index 3fb614713284bc2ce07b013f02ea583ba3a102cb..6465ff4c93479f724f5d0b6156a4392b9e483375 100644 (file)
--- 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 cef64c1b2d1a9b3589fbb35c2eb46161282cc58d..5f22083cbf7132a5a32c0acdfed7bf4b1b086783 100644 (file)
--- 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 231479a99b72cc6d76c14606f205d3772240b6ec..1f2a7f55e81c25fc1e2fbf68faf3810fda79cb08 100644 (file)
--- 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 645bc2544e6f20eba0d42d8e774494a2811617cc..024e96161ad849ae03878ae543543fa06e62b751 100644 (file)
--- 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 4c74f74ae2b2c489a4a394f32300975648853a2c..4e181bb75c27431f6a8abdbc07df6d7c247c2d66 100644 (file)
--- 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"
 }