Switch to unified view

a/src/utils/x11mon.cpp b/src/utils/x11mon.cpp
...
...
2
#ifndef lint
2
#ifndef lint
3
static char rcsid[] = "@(#$Id: x11mon.cpp,v 1.1 2006-12-23 12:23:15 dockes Exp $ (C) 2006 J.F.Dockes";
3
static char rcsid[] = "@(#$Id: x11mon.cpp,v 1.1 2006-12-23 12:23:15 dockes Exp $ (C) 2006 J.F.Dockes";
4
#endif
4
#endif
5
// Poll state of X11 connectibility (to detect end of user session).
5
// Poll state of X11 connectibility (to detect end of user session).
6
#include "autoconfig.h"
6
#include "autoconfig.h"
7
#ifndef WITHOUT_X11
7
#ifndef DISABLE_X11MON
8
#include <stdio.h>
8
#include <stdio.h>
9
#include <X11/Xlib.h>
9
#include <X11/Xlib.h>
10
#include <signal.h>
10
#include <signal.h>
11
#include <setjmp.h>
11
#include <setjmp.h>
12
12
...
...
62
#else
62
#else
63
bool x11IsAlive() 
63
bool x11IsAlive() 
64
{
64
{
65
    return true;
65
    return true;
66
}
66
}
67
#endif /* WITHOUT_X11 */
67
#endif /* DISABLE_X11MON */
68
68
69
#else
69
#else
70
70
71
// Test driver
71
// Test driver
72
72