You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.2 KiB
48 lines
1.2 KiB
commit 5b7a534126e2ed2d26d75c1321a9bc58a5a95a29
|
|
Author: Slávek Banko <slavek.banko@axis.cz>
|
|
Date: Thu Oct 29 00:09:36 2020 +0100
|
|
|
|
Fix FTBFS due to redefine the 'log' symbol in tdmlib.
|
|
|
|
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
|
|
|
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
|
|
index e7a5f074..69eac485 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 *
|