From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 7 Feb 2018 00:32:39 +0000 (-0800)
Subject: Changes to common header files; not applicable to open-vm-tools.
X-Git-Tag: stable-10.3.0~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=035765d487f8ab9b2222ad239b278e4725aa5a22;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files; not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/guestApp/guestApp.c b/open-vm-tools/lib/guestApp/guestApp.c
index 3a7b3042f..315f3e3e5 100644
--- a/open-vm-tools/lib/guestApp/guestApp.c
+++ b/open-vm-tools/lib/guestApp/guestApp.c
@@ -27,6 +27,14 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef _MSC_VER
+#include <windows.h>
+#include <shlobj.h>
+#include "productState.h"
+#include "winregistry.h"
+#include "windowsUtil.h"
+#endif
+
 #include "vmware.h"
 #include "vm_version.h"
 #include "vm_tools_version.h"
@@ -43,14 +51,6 @@
 #include "posix.h"
 #include "vmware/guestrpc/tclodefs.h"
 
-#ifdef _MSC_VER
-#include <windows.h>
-#include <shlobj.h>
-#include "productState.h"
-#include "winregistry.h"
-#include "windowsUtil.h"
-#endif
-
 /*
  * For Netware/Linux/BSD/Solaris, the install path
  * is the hardcoded value below. For Windows, it is
diff --git a/open-vm-tools/lib/include/libExport.hh b/open-vm-tools/lib/include/libExport.hh
index 2dc4bd28e..4bb1bfa07 100644
--- a/open-vm-tools/lib/include/libExport.hh
+++ b/open-vm-tools/lib/include/libExport.hh
@@ -28,22 +28,28 @@
 
 #include "vm_api.h"
 
-#ifdef LIB_EXPORT_SOURCE
-   #define LIB_EXPORT VMW_LIB_DYNAMIC
-#else
-   #define LIB_EXPORT VMW_LIB_CLIENT
+#ifndef LIB_EXPORT
+   #ifdef LIB_EXPORT_SOURCE
+      #define LIB_EXPORT VMW_LIB_DYNAMIC
+   #else
+      #define LIB_EXPORT VMW_LIB_CLIENT
+   #endif
 #endif
 
-#ifdef LIB_EXPORT_WUI_SOURCE
-   #define LIB_EXPORT_WUI VMW_LIB_DYNAMIC
-#else
-   #define LIB_EXPORT_WUI VMW_LIB_CLIENT
+#ifndef LIB_EXPORT_WUI
+   #ifdef LIB_EXPORT_WUI_SOURCE
+      #define LIB_EXPORT_WUI VMW_LIB_DYNAMIC
+   #else
+      #define LIB_EXPORT_WUI VMW_LIB_CLIENT
+   #endif
 #endif
 
-#ifdef VMSTRING_EXPORT_SOURCE
-   #define VMSTRING_EXPORT VMW_LIB_DYNAMIC
-#else
-   #define VMSTRING_EXPORT VMW_LIB_CLIENT
+#ifndef VMSTRING_EXPORT
+   #ifdef VMSTRING_EXPORT_SOURCE
+      #define VMSTRING_EXPORT VMW_LIB_DYNAMIC
+   #else
+      #define VMSTRING_EXPORT VMW_LIB_CLIENT
+   #endif
 #endif
 
 #endif // LIB_EXPORT_HH