From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 1 Apr 2020 18:31:36 +0000 (-0700)
Subject: lib/mics/sha1.c: Include string.h unconditionally.
X-Git-Tag: stable-11.2.0~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3777c7008da506fe35b1b8003b3d1ae7067662ae;p=thirdparty%2Fopen-vm-tools.git

lib/mics/sha1.c: Include string.h unconditionally.

string.h is part of POSIX, lets include it unconditionally
---

diff --git a/open-vm-tools/lib/misc/sha1.c b/open-vm-tools/lib/misc/sha1.c
index 2dc55fa48..2103b937b 100644
--- a/open-vm-tools/lib/misc/sha1.c
+++ b/open-vm-tools/lib/misc/sha1.c
@@ -53,30 +53,20 @@
  *    test-esx -n misc/sha1.sh
  */
 
-#if defined(USERLEVEL) || defined(_WIN32)
-#   include <string.h>
-#   if defined(_WIN32)
-#      include <memory.h>
-#   endif
+#if defined(_WIN32)
+#   include <memory.h>
 #endif
 
 #if defined(sun) && !defined(SOL9)
-#include <memory.h>
+#   include <memory.h>
 #endif
 
-#if defined(__FreeBSD__)
-#   if defined(_KERNEL)
-#      include <sys/libkern.h>
-#      include <sys/systm.h>
-#   else
-#      include <string.h>
-#   endif
-#endif
-
-#if defined(__APPLE__)
-#      include <string.h>
+#if defined(__FreeBSD__) && defined(_KERNEL)
+#   include <sys/libkern.h>
+#   include <sys/systm.h>
 #endif
 
+#include <string.h>
 #include "vmware.h"
 #include "sha1.h"
 #include "vm_basic_asm.h"