--- open-vm-tools-12.4.0-23259341/vgauth/common/VGAuthLog.c.old	2024-02-06 09:07:33.000000000 -0600
+++ open-vm-tools-12.4.0-23259341/vgauth/common/VGAuthLog.c	2024-05-22 14:27:07.008724455 -0500
@@ -210,7 +210,7 @@
    g_vsnprintf(buf, sizeof buf, fmt, args);
    buf[sizeof buf - 1] = '\0';
 
-#ifdef sun
+#ifndef __GLIBC__
    strerror_r(code, errMsg, sizeof errMsg);
    g_warning("[function %s, file %s, line %d], %s, [errno = %d], %s\n",
              func, file, line, buf, code, errMsg);
--- open-vm-tools-12.4.0-23259341/vgauth/lib/netPosix.c.old	2024-02-06 09:07:36.000000000 -0600
+++ open-vm-tools-12.4.0-23259341/vgauth/lib/netPosix.c	2024-05-22 14:26:11.458768814 -0500
@@ -27,7 +27,6 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sys/unistd.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
--- open-vm-tools-12.4.0-23259341/vgauth/serviceImpl/netPosix.c.old	2024-02-06 09:07:35.000000000 -0600
+++ open-vm-tools-12.4.0-23259341/vgauth/serviceImpl/netPosix.c	2024-05-22 14:28:53.728639235 -0500
@@ -27,7 +27,6 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sys/unistd.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
--- open-vm-tools-12.4.0-23259341/vgauth/common/vmxrpc.c.old	2024-02-06 09:07:36.000000000 -0600
+++ open-vm-tools-12.4.0-23259341/vgauth/common/vmxrpc.c	2024-05-22 14:42:02.708035980 -0500
@@ -76,13 +76,13 @@
 typedef unsigned __int64 uint64;
 
 #endif
-#ifdef __linux__
+#if defined(__linux__) && defined(__GLIBC__)
 typedef __uint32_t uint32;
 typedef __uint64_t uint64;
 
 #define SOCKET int
 #endif
-#ifdef sun
+#if (defined(__linux__) && !defined(__GLIBC__)) || defined(sun)
 typedef uint32_t uint32;
 typedef uint64_t uint64;