From: Kruti Pendharkar <kp025370@broadcom.com>
Date: Tue, 22 Jul 2025 07:06:54 +0000 (-0700)
Subject: Change to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-13.1.0~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a95f4a77808326f5db3e40fb117996fa35602ecf;p=thirdparty%2Fopen-vm-tools.git

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

diff --git a/open-vm-tools/lib/include/log.h b/open-vm-tools/lib/include/log.h
index 13ea91357..240b809ae 100644
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -317,7 +317,7 @@ Log_Trivia(const char *fmt,
    va_end(ap);
 }
 
-#if !defined(VMM)
+#if !defined(VMM) && !defined(GLM)
 typedef struct {
    int32       legalLevelValue;
    const char *legalName;
@@ -818,4 +818,3 @@ Log_IsThrottled(LogThrottleInfo *info,
 
 #define VMW_LOG_ROUTING_EX(name, level) \
         (((LOGFACILITY_GROUPVAR(name) + 1) << VMW_LOG_LEVEL_BITS) | (level))
-
diff --git a/open-vm-tools/lib/include/vthreadBase.h b/open-vm-tools/lib/include/vthreadBase.h
index b473e5fe7..731d5be40 100644
--- a/open-vm-tools/lib/include/vthreadBase.h
+++ b/open-vm-tools/lib/include/vthreadBase.h
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (C) 2006-2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 2006-2025 Broadcom. All Rights Reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * 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 +37,7 @@
 
 #include "vm_atomic.h"
 
-#if !defined VMM
+#if !defined VMM && !defined GLM
 
 /*
  * Most major OSes now support __thread, so begin making TLS access via
@@ -82,7 +83,7 @@ typedef uintptr_t VThreadID;
 
 #define VTHREAD_INVALID_ID    (VThreadID)(0)
 
-#ifdef VMM
+#if defined(VMM) || defined(GLM)
 /*
  *-----------------------------------------------------------------------------
  *