Change to common header file 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 5e4677829b67c5419ded286a353ac44b9674c185..b5c76b0ff997f9d10ed6cc02e8653d8b22ba9625 100644 (file)
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -501,6 +501,8 @@ typedef Bool (GetOpId)(size_t maxStringLen,
 void
 Log_RegisterOpIdFunction(GetOpId *getOpIdFunc);
 
+void Log_LoadModuleFilters(struct CfgInterface *cfgIf);
+
 #endif /* !VMM */
 
 #if defined(__cplusplus)

diff --git a/open-vm-tools/lib/include/loglevel_userVars.h b/open-vm-tools/lib/include/loglevel_userVars.h
index f94faa0da15d988b96c02c3218c18ae86123eefb..1ea485bad58cfd93dbc4664ef930ea02f604cdc0 100644 (file)
--- a/open-vm-tools/lib/include/loglevel_userVars.h
+++ b/open-vm-tools/lib/include/loglevel_userVars.h
@@ -27,8 +27,6 @@
 /* KEEP IN SORTED ORDER! */
 
 #define LOGLEVEL_USER(LOGLEVEL_VAR) \
-   /* main has to be first. */ \
-   LOGLEVEL_VAR(main), \
    LOGLEVEL_VAR(acpi), \
    LOGLEVEL_VAR(acpiGPE), \
    LOGLEVEL_VAR(ahci), \
@@ -139,6 +137,7 @@
    LOGLEVEL_VAR(macfilter), \
    LOGLEVEL_VAR(machPoll), \
    LOGLEVEL_VAR(maclatency), \
+   LOGLEVEL_VAR(main), \
    LOGLEVEL_VAR(mainMem), \
    LOGLEVEL_VAR(mainMemReplayCheck), \
    LOGLEVEL_VAR(masReceipt), /* lib/masReceipt */ \