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

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

diff --git a/open-vm-tools/lib/misc/codesetOld.c b/open-vm-tools/lib/misc/codesetOld.c
index 4086959aa..fb4f194bb 100644
--- a/open-vm-tools/lib/misc/codesetOld.c
+++ b/open-vm-tools/lib/misc/codesetOld.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017,2019,2021,2022 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2017,2019,2021-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
@@ -646,7 +646,7 @@ CodeSetOldGetCodeSetFromLocale(void)
 {
    char *codeset;
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(__EMSCRIPTEN__)
 
    locale_t new = newlocale(LC_CTYPE_MASK, "", NULL);
    if (!new) {
@@ -656,9 +656,9 @@ CodeSetOldGetCodeSetFromLocale(void)
        * locale.
        */
 
-      new = newlocale(LC_CTYPE_MASK, "C", NULL); 
-      ASSERT(new); 
-   } 
+      new = newlocale(LC_CTYPE_MASK, "C", NULL);
+      ASSERT(new);
+   }
    codeset = Util_SafeStrdup(nl_langinfo_l(CODESET, new));
    freelocale(new);
 
@@ -928,7 +928,7 @@ CodeSetOld_GenericToGenericDb(char const *codeIn,   // IN:
        * change bufIn so a simple cast is safe. --plangdale
        */
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__EMSCRIPTEN__)
       status = iconv(cd, (char **)&bufIn, &sizeIn, &out, &outLeft);
 #else
       status = iconv(cd, &bufIn, &sizeIn, &out, &outLeft);