From 1a97a720e5b84aab02c9dfc8fe0bf504182825af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 29 Oct 2020 00:09:36 +0100 Subject: [PATCH] Fix FTBFS due to redefine the 'log' symbol in tdmlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- tdmlib/kgreet_pam.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp index e7a5f0747..69eac485b 100644 --- a/tdmlib/kgreet_pam.cpp +++ b/tdmlib/kgreet_pam.cpp @@ -55,7 +55,7 @@ protected: virtual void contextMenuEvent( TQContextMenuEvent * ) {} }; -static FILE* log; +static FILE *logFile; static void kg_debug(const char* fmt, ...) { va_list lst; @@ -63,8 +63,8 @@ static void kg_debug(const char* fmt, ...) #ifdef PAM_GREETER_DEBUG #if 0 - vfprintf(log, fmt, lst); - fflush(log); + vfprintf(logFile, fmt, lst); + fflush(logFile); #else char buf[6000]; sprintf(buf, "*** %s\n", fmt); @@ -691,9 +691,11 @@ static bool init( const TQString &, static void done( void ) { TDEGlobal::locale()->removeCatalogue( "kgreet_pam" ); - if (log && log != stderr) - fclose(log); - log = 0; + if (logFile && (logFile != stderr)) + { + fclose(logFile); + } + logFile = 0; } static KGreeterPlugin *