summaryrefslogtreecommitdiffstats
path: root/tdmlib
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-10-29 00:09:36 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-11-04 16:50:08 +0100
commit1a97a720e5b84aab02c9dfc8fe0bf504182825af (patch)
tree8cc23d2c8160b455926ccc8bf3c639deca5a5bc5 /tdmlib
parentd8c7fa1e66e633862a6c98cc2c0c36c9c4894998 (diff)
downloadtdebase-1a97a720e5b84aab02c9dfc8fe0bf504182825af.tar.gz
tdebase-1a97a720e5b84aab02c9dfc8fe0bf504182825af.zip
Fix FTBFS due to redefine the 'log' symbol in tdmlib.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tdmlib')
-rw-r--r--tdmlib/kgreet_pam.cpp14
1 files 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 *