From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 7 Jun 2022 16:52:42 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-12.1.0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b6597b97ce0d1607cb0602731b9c2d4ca0c5162;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 5ead35fda..71c187400 100644
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -220,7 +220,7 @@ typedef enum {
    #define LOG_FILTER_DEFAULT_LEVEL VMW_LOG_INFO
 #endif
 
-#ifdef VMX86_SERVER
+#if defined(VMX86_SERVER)
 /* WORLD_MAX_OPID_STRING_SIZE */
 #define LOG_MAX_OPID_LENGTH 128
 #else
@@ -228,6 +228,24 @@ typedef enum {
 #define LOG_MAX_OPID_LENGTH 32
 #endif
 
+#define LOG_NO_KEEPOLD                 0  // Keep no old log files
+#define LOG_NO_ROTATION_SIZE           0  // Do not rotate based on file size
+#define LOG_NO_THROTTLE_THRESHOLD      0  // No threshold before throttling
+#define LOG_NO_BPS_LIMIT               0xFFFFFFFF  // unlimited input rate
+
+/*
+ * The defaults for how many older log files to kept around, and what to do
+ * with rotation-by-size.
+ */
+
+#if defined(VMX86_SERVER)
+#define LOG_DEFAULT_KEEPOLD       10
+#define LOG_DEFAULT_ROTATION_SIZE 2048000
+#else
+#define LOG_DEFAULT_KEEPOLD       3
+#define LOG_DEFAULT_ROTATION_SIZE LOG_NO_ROTATION_SIZE
+#endif
+
 /*
  * The "routing" parameter contains the level in the low order bits;
  * the higher order bits specify the group of the log call.
@@ -664,25 +682,6 @@ Bool
 Log_GetFileObject(const LogOutput *output,
                   LogFileObject *result);
 
-#define LOG_NO_KEEPOLD                 0  // Keep no old log files
-#define LOG_NO_ROTATION_SIZE           0  // Do not rotate based on file size
-#define LOG_NO_THROTTLE_THRESHOLD      0  // No threshold before throttling
-#define LOG_NO_BPS_LIMIT               0xFFFFFFFF  // unlimited input rate
-
-/*
- * The defaults for how many older log files to kept around, and what to do
- * with rotation-by-size.
- */
-
-#if defined(VMX86_SERVER)
-#define LOG_DEFAULT_KEEPOLD       10
-#define LOG_DEFAULT_ROTATION_SIZE 2048000
-#else
-#define LOG_DEFAULT_KEEPOLD       3
-#define LOG_DEFAULT_ROTATION_SIZE LOG_NO_ROTATION_SIZE
-#endif
-
-
 /*
  * Assemble a line.
  */