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

Remove extern "C"
---

diff --git a/open-vm-tools/lib/include/message.h b/open-vm-tools/lib/include/message.h
index 9cda09ba4..9a91bb34b 100644
--- 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 b481a2a6d..dc76f20f5 100644
--- 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 9738ef2d6..5adeb7442 100644
--- 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