summaryrefslogtreecommitdiffstats
path: root/package/blackbox/blackbox-0.70.1-gcc46-textpropertytostring.patch
blob: af03be4b9c9f690fd27171c4a02f307a02efd569 (plain)
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
[PATCH] fix build issue with gcc 4.6+

Debian patch from http://patch-tracker.debian.org/patch/series/dl/blackbox/0.70.1-13/textpropertytostring-unconditional.diff

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

Description: Declare bt::textPropertyToString unconditionally.
Author: Jakub Wilk <jwilk@debian.org>
Forwarded: no
Bug-Debian: http://bugs.debian.org/614468
Last-Update: 2011-03-12

--- a/lib/Util.hh
+++ b/lib/Util.hh
@@ -25,6 +25,8 @@
 #ifndef __Util_hh
 #define __Util_hh
 
+#include <X11/Xutil.h>
+
 #include <limits.h>
 #include <string>
 
@@ -94,10 +96,8 @@
 
   std::string tolower(const std::string &string);
 
-#ifdef _XUTIL_H_
   std::string textPropertyToString(::Display *display,
                                    ::XTextProperty& text_prop);
-#endif
 
 } // namespace bt