]> rtime.felk.cvut.cz Git - coffee/buildroot.git/blob - package/blackbox/0003-gcc46-textpropertytostring.patch
af03be4b9c9f690fd27171c4a02f307a02efd569
[coffee/buildroot.git] / package / blackbox / 0003-gcc46-textpropertytostring.patch
1 [PATCH] fix build issue with gcc 4.6+
2
3 Debian patch from http://patch-tracker.debian.org/patch/series/dl/blackbox/0.70.1-13/textpropertytostring-unconditional.diff
4
5 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
6
7 Description: Declare bt::textPropertyToString unconditionally.
8 Author: Jakub Wilk <jwilk@debian.org>
9 Forwarded: no
10 Bug-Debian: http://bugs.debian.org/614468
11 Last-Update: 2011-03-12
12
13 --- a/lib/Util.hh
14 +++ b/lib/Util.hh
15 @@ -25,6 +25,8 @@
16  #ifndef __Util_hh
17  #define __Util_hh
18  
19 +#include <X11/Xutil.h>
20 +
21  #include <limits.h>
22  #include <string>
23  
24 @@ -94,10 +96,8 @@
25  
26    std::string tolower(const std::string &string);
27  
28 -#ifdef _XUTIL_H_
29    std::string textPropertyToString(::Display *display,
30                                     ::XTextProperty& text_prop);
31 -#endif
32  
33  } // namespace bt
34