From: Katy Feng <fkaty@vmware.com>
Date: Tue, 22 Aug 2023 18:11:42 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.3.0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=901511c7de7a1d870725eeeb5f660f8728dd119d;p=thirdparty%2Fopen-vm-tools.git

Change to common header file not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/compat/compat_stdarg.h b/open-vm-tools/lib/include/compat/compat_stdarg.h
index 900a2f81e..5295e5c9d 100644
--- a/open-vm-tools/lib/include/compat/compat_stdarg.h
+++ b/open-vm-tools/lib/include/compat/compat_stdarg.h
@@ -36,10 +36,13 @@
  *    Compatibility defines for systems that need the stdarg features. If your program
  *    needs va_init, va_copy, va_end, etc. then include this file instead of including
  *    stdarg.h directly.
+ *
+ *    Note that the header guard for this file does not follow typical naming
+ *    convention as _COMPAT_STDARG_H conflicts with emscripten's compat/stdarg.h
  */
 
-#ifndef _COMPAT_STDARG_H
-#define _COMPAT_STDARG_H 1
+#ifndef _VMWARE_COMPAT_STDARG_H
+#define _VMWARE_COMPAT_STDARG_H 1
 
 #define INCLUDE_ALLOW_USERLEVEL
 
@@ -66,4 +69,4 @@
 #   endif
 #endif
 
-#endif /* _COMPAT_STDARG_H */
+#endif /* _VMWARE_COMPAT_STDARG_H */