Removing windows header file which is not needed for OVT build

Changeset deletes code which references a Windows specific
header file and cleans up some whitespace.

diff --git a/open-vm-tools/lib/include/windowsUtil.h b/open-vm-tools/lib/include/windowsUtil.h
deleted file mode 100644 (file)
index b1c6a03..0000000
--- a/open-vm-tools/lib/include/windowsUtil.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*********************************************************
- * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation version 2.1 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *********************************************************/
-
-/*
- * WindowsUtil.h --
- *
- *    misc Windows utilities
- */
-
-#ifndef WINDOWSUTIL_H_
-#define WINDOWSUTIL_H_
-
-#define INCLUDE_ALLOW_USERLEVEL
-#include "includeCheck.h"
-
-#include "vm_basic_types.h"
-#include "vm_atomic.h"
-#include "unicodeTypes.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifdef _WIN32
-
-/* Defines */
-#define VMX_SHUTDOWN_ORDER          0x101 // Application reserved last shutdown range.
-#define UI_SHUTDOWN_ORDER           0x300 // Application reserved first shutdown range.
-#define TOOLS_SHUTDOWN_ORDER        0x100 // Application reserved last shutdown range.
-#define MKS_SANDBOX_SHUTDOWN_ORDER  0x100 // Application reserved last shutdown range.
-
-#include <windows.h>
-
-#if !defined(VM_WIN_UWP)
-#include "win32Util.h"
-#endif
-
-
-/* Function declarations */
-
-char * W32Util_GetInstallPath(void);
-char * W32Util_GetInstallPath64(void);
-
-/*
- * The string returned is allocated on the heap and must be freed by the
- * calling routine.
- */
-
-char *W32Util_GetAppDataFilePath(const char *fileName);
-char *W32Util_GetLocalAppDataFilePath(const char *fileName);
-
-char *W32Util_GetCommonAppDataFilePath(const char *fileName);
-char *W32Util_GetVmwareCommonAppDataFilePath(const char *fileName);
-
-char *W32Util_GetMyDocumentPath(void);
-char *W32Util_GetMyVideoPath(BOOL myDocumentsOnFail);
-
-char *W32Util_GetDefaultVMPath(const char *pref);
-char *W32Util_GetInstalledFilePath(const char *fileName);
-char *W32Util_GetInstalledFilePath64(const char *fileName);
-
-CRITICAL_SECTION *W32Util_GetSingletonCriticalSection(Atomic_Ptr *csMemory);
-
-#endif // _WIN32
-
-#if defined(__cplusplus)
-}  // extern "C"
-#endif
-
-#endif // WIN32UTIL_H_

diff --git a/open-vm-tools/lib/misc/codeset.c b/open-vm-tools/lib/misc/codeset.c
index 6123af6524570652ef31cc801c8fbb4e049c470d..25221f6c7d52b311dd1eead9800f1b77347196ef 100644 (file)
--- a/open-vm-tools/lib/misc/codeset.c
+++ b/open-vm-tools/lib/misc/codeset.c
@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright (C) 1998-2017 VMware, Inc.  All rights reserved.
+ * Copyright (C) 1998-2020 VMware, Inc.  All rights reserved.
  * **********************************************************/
 
 /*
@@ -55,6 +55,7 @@
 #   include <windows.h>
 #   include <malloc.h>
 #   include <str.h>
+#   include "windowsUtil.h"
 #else
 #   define _GNU_SOURCE
 #   include <string.h>
@@ -84,7 +85,6 @@
 #include "codeset.h"
 #include "codesetOld.h"
 #include "str.h"
-#include "windowsUtil.h"
 #if defined __APPLE__
 #   define LOCATION_WEAK
 #   include "location.h"
@@ -234,7 +234,7 @@ CodeSetGetModulePath(HANDLE hModule) // IN
  *      On success: The allocated, NUL-terminated file path.
  *         Note: This path can be a symbolic or hard link; it's just one
  *         possible path to access the executable.
- *         
+ *
  *      On failure: NULL.
  *
  * Side effects:
@@ -315,7 +315,7 @@ CodeSetGetModulePath(uint32 priv)
  *     Try to convert the path into a short name so it may work with
  *      local encoding.
  *
- *      XXX -- this function is a temporary fix. It should be removed once 
+ *      XXX -- this function is a temporary fix. It should be removed once
  *             we fix the 3rd party library pathname issue.
  *
  * Results:
@@ -1397,7 +1397,7 @@ CodeSet_Utf8ToUtf16le(const char *bufIn,  // IN
  *
  * CodeSet_Utf8FormDToUtf8FormC  --
  *
- *    Convert the content of a buffer (that uses the UTF-8 encoding) 
+ *    Convert the content of a buffer (that uses the UTF-8 encoding)
  *    which is in normal form D (decomposed) into another buffer
  *    (that uses the UTF-8 encoding) and is normalized as
  *    precomposed (Normalization Form C).
@@ -1446,7 +1446,7 @@ CodeSet_Utf8FormDToUtf8FormC(const char *bufIn,     // IN
  *
  * CodeSet_Utf8FormCToUtf8FormD  --
  *
- *    Convert the content of a buffer (that uses the UTF-8 encoding) 
+ *    Convert the content of a buffer (that uses the UTF-8 encoding)
  *    which is in normal form C (precomposed) into another buffer
  *    (that uses the UTF-8 encoding) and is normalized as
  *    decomposed (Normalization Form D).