From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 6 Oct 2020 21:30:54 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a869ed128c313d6335316fa10ebfbe15ace2be73;p=thirdparty%2Fopen-vm-tools.git

Common header file change 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 702d937b5..bc71943d9 100644
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -446,7 +446,7 @@ Bool
 Log_Outputting(void);
 
 Bool
-Log_IsRoutingEnabled(uint32 routing);
+Log_IsEnabled(uint32 routing);
 
 const char *
 Log_GetFileName(void);
@@ -618,11 +618,11 @@ Log_LoadModuleFilters(struct CfgInterface *cfgIf);
 #define LogV_Module(level, ...) \
    LogV(LOG_ROUTING_BITS(level), __VA_ARGS__)
 
-#if defined(Log_IsRoutingEnabledModule)
-   #undef Log_IsRoutingEnabledModule
+#if defined(Log_IsEnabledModule)
+   #undef Log_IsEnabledModule
 #endif
 
-#define Log_IsRoutingEnabledModule(level) \
-   Log_IsRoutingEnabled(LOG_ROUTING_BITS(level))
+#define Log_IsEnabledModule(level) \
+   Log_IsEnabled(LOG_ROUTING_BITS(level))