From: Katy Feng <fkaty@vmware.com>
Date: Thu, 5 Oct 2023 17:35:26 +0000 (-0700)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-12.4.0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0633d24feca0d9aa28696b4156c6f1944d3e7644;p=thirdparty%2Fopen-vm-tools.git

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

diff --git a/open-vm-tools/lib/include/globalConfig.h b/open-vm-tools/lib/include/globalConfig.h
index 55ecb845e..9e766cb7f 100644
--- a/open-vm-tools/lib/include/globalConfig.h
+++ b/open-vm-tools/lib/include/globalConfig.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2020-2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 2020-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
@@ -19,7 +19,8 @@
 #ifndef _GLOBAL_CONFIG_H_
 #define _GLOBAL_CONFIG_H_
 
-#if defined(_WIN32) || (defined(__linux__) && !defined(USERWORLD))
+#if (defined(_WIN32) && !defined(_ARM64_)) || \
+    (defined(__linux__) && !defined(USERWORLD))
 
 #define GLOBALCONFIG_SUPPORTED 1
 
diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index 7f54319e0..5217be5da 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -45,8 +45,8 @@
 #include "vmware/tools/utils.h"
 #include "vmware/tools/vmbackup.h"
 
-#if defined(_WIN32) || \
-   (defined(__linux__) && !defined(USERWORLD))
+#if (defined(_WIN32) && !defined(_ARM64_)) || \
+    (defined(__linux__) && !defined(USERWORLD))
 #  include "vmware/tools/guestStore.h"
 #  include "globalConfig.h"
 #endif
@@ -55,7 +55,7 @@
  * guestStoreClient library is needed for both GuestStore-based tools upgrade
  * and also for GlobalConfig module.
  */
-#if defined(_WIN32) || defined(GLOBALCONFIG_SUPPORTED)
+#if (defined(_WIN32) &&  !defined(_ARM64_)) || defined(GLOBALCONFIG_SUPPORTED)
 #  include "guestStoreClient.h"
 #endif
 
@@ -118,8 +118,8 @@ static gboolean gGlobalConfStarted = FALSE;
 static void
 ToolsCoreCleanup(ToolsServiceState *state)
 {
-#if defined(_WIN32) || \
-   (defined(__linux__) && !defined(USERWORLD))
+#if (defined(_WIN32) && !defined(_ARM64_)) || \
+    (defined(__linux__) && !defined(USERWORLD))
    if (state->mainService) {
       /*
        * Shut down guestStore plugin first to prevent worker threads from being
@@ -137,7 +137,7 @@ ToolsCoreCleanup(ToolsServiceState *state)
    }
 #endif
 
-#if defined(_WIN32) || defined(GLOBALCONFIG_SUPPORTED)
+#if (defined(_WIN32) && !defined(_ARM64_)) || defined(GLOBALCONFIG_SUPPORTED)
    /*
     * guestStoreClient library is needed for both GuestStore-based tools
     * upgrade and also for GlobalConfig module.
@@ -472,7 +472,7 @@ ToolsCoreRunLoop(ToolsServiceState *state)
    }
 #endif
 
-#if defined(_WIN32) || defined(GLOBALCONFIG_SUPPORTED)
+#if (defined(_WIN32) && !defined(_ARM64_)) || defined(GLOBALCONFIG_SUPPORTED)
    /*
     * guestStoreClient library is needed for both GuestStore-based tools
     * upgrade and also for GlobalConfig module.
diff --git a/open-vm-tools/services/vmtoolsd/toolsCoreInt.h b/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
index 57723f532..409eed63c 100644
--- a/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
+++ b/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2008-2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 2008-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
@@ -32,7 +32,8 @@
 #include <glib-object.h>
 #include <gmodule.h>
 #include <time.h>
-#if defined(_WIN32) || (defined(__linux__) && !defined(USERWORLD))
+#if (defined(_WIN32)  && !defined(_ARM64_)) || \
+    (defined(__linux__) && !defined(USERWORLD))
 /* Need this header for GLOBALCONFIG_SUPPORTED definition.*/
 #include "globalConfig.h"
 #endif