1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
commit 5b7a534126e2ed2d26d75c1321a9bc58a5a95a29
Author: Slávek Banko <[email protected]>
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 <[email protected]>
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 *
|
