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

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

diff --git a/open-vm-tools/lib/include/iovector.h b/open-vm-tools/lib/include/iovector.h
index 2354d5b4e..170017edd 100644
--- a/open-vm-tools/lib/include/iovector.h
+++ b/open-vm-tools/lib/include/iovector.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2023 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
@@ -36,7 +36,8 @@ extern "C" {
 /*
  * Ugly definition of struct iovec.
  */
-#if defined(__linux__) || defined(sun) || defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(sun) || defined(__APPLE__) || \
+    defined(__FreeBSD__) || defined(__EMSCRIPTEN__)
 #include <sys/uio.h>    // for struct iovec
 #else
 
@@ -59,7 +60,7 @@ typedef struct VMIOVec {
    uint32 numEntries;           /* Total number of entries */
    Bool read;                   /* is it a readv operation? else it's write */
    struct iovec *entries;       /* Array of entries (dynamically allocated) */
-   struct iovec *allocEntries;  /* The original array that can be passed to free(). 
+   struct iovec *allocEntries;  /* The original array that can be passed to free().
                                  * NULL if entries is on a stack. */
 } VMIOVec;
 
diff --git a/open-vm-tools/lib/include/su.h b/open-vm-tools/lib/include/su.h
index 67e88ae9e..fbde341a2 100644
--- a/open-vm-tools/lib/include/su.h
+++ b/open-vm-tools/lib/include/su.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2023 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
@@ -55,7 +55,8 @@ Bool Id_AuthCheck(char const *right,
                   char const *localizedDescription,
                   Bool showDialogIfNeeded);
 
-#elif (defined(__linux__) || defined(sun) || defined(__FreeBSD__))
+#elif defined(__linux__) || defined(sun) || defined(__FreeBSD__) || \
+      defined(__EMSCRIPTEN__)
 
 #include <sys/types.h>
 #include <unistd.h>