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
|
--- lib/Display.cc.orig 2005-01-03 09:42:38 UTC
+++ lib/Display.cc
@@ -25,6 +25,7 @@
#include "Display.hh"
#include <algorithm>
+#include <cstdlib>
#include <X11/Xutil.h>
@@ -32,7 +33,6 @@
#include <fcntl.h>
#include <stdio.h>
-
namespace bt {
void createBitmapLoader(const Display &display);
@@ -68,7 +68,7 @@ bt::Display::Display(const char *dpy_name, bool multi_
if (!(xdisplay = XOpenDisplay(dpy_name))) {
fprintf(stderr, "bt::Display: failed to open display '%s'\n",
dpy_name ? dpy_name : "");
- ::exit(2);
+ std::exit(2);
}
#ifdef DEBUG
@@ -77,7 +77,7 @@ bt::Display::Display(const char *dpy_name, bool multi_
if (fcntl(XConnectionNumber(xdisplay), F_SETFD, 1) == -1) {
fprintf(stderr, "bt::Display: failed to mark connection close-on-exec\n");
- ::exit(2);
+ std::exit(2);
}
if (!multi_head || ScreenCount(xdisplay) == 1) {
|
