Remove extern "C"

diff --git a/open-vm-tools/lib/include/message.h b/open-vm-tools/lib/include/message.h
index 9cda09ba41c8abeb81037d8dd0e0141a7af27c94..9a91bb34bc02dd43086d113523555b457f92139b 100644 (file)
--- a/open-vm-tools/lib/include/message.h
+++ b/open-vm-tools/lib/include/message.h
@@ -40,12 +40,12 @@
 #ifndef __MESSAGE_H__
 #   define __MESSAGE_H__
 
+#include "vm_basic_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "vm_basic_types.h"
-
 
 /* The channel object */
 typedef struct Message_Channel {

diff --git a/open-vm-tools/lib/include/tracer.hh b/open-vm-tools/lib/include/tracer.hh
index b481a2a6db4e0e53c7118d44ee5c2c63b9b6a89d..dc76f20f504c337f719c4ca983b4e44284f5c0b0 100644 (file)
--- a/open-vm-tools/lib/include/tracer.hh
+++ b/open-vm-tools/lib/include/tracer.hh
@@ -26,9 +26,9 @@
 #ifndef TRACER_HH
 #define TRACER_HH
 
+#include "vm_basic_defs.h"
 
 extern "C" {
-#include "vm_basic_defs.h"
 #include "glib.h"
 }
 

diff --git a/open-vm-tools/lib/include/vmcheck.h b/open-vm-tools/lib/include/vmcheck.h
index 9738ef2d64305980750e07355c5ca5bed520bf73..5adeb74423196594dcddd1b881cc277a1c01d9e2 100644 (file)
--- a/open-vm-tools/lib/include/vmcheck.h
+++ b/open-vm-tools/lib/include/vmcheck.h
@@ -27,12 +27,12 @@
 #ifndef __VMCHECK_H__
 #   define __VMCHECK_H__
 
+#include "vm_basic_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#   include "vm_basic_types.h"
-
 Bool
 VmCheck_GetVersion(uint32 *version, // OUT
                    uint32 *type);   // OUT