diff options
Diffstat (limited to 'src/FbTk/XmbFontImp.cc')
-rw-r--r-- | src/FbTk/XmbFontImp.cc | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index 557708a..2d6c6f4 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc | |||
@@ -31,29 +31,17 @@ | |||
31 | #include <locale.h> | 31 | #include <locale.h> |
32 | #endif // HAVE_SETLOCALE | 32 | #endif // HAVE_SETLOCALE |
33 | 33 | ||
34 | #ifdef HAVE_CSTDIO | 34 | #include <cstdarg> |
35 | #include <cstdio> | 35 | #include <cstring> |
36 | #else | ||
37 | #include <stdio.h> | ||
38 | #endif | ||
39 | #ifdef HAVE_CSTDARG | ||
40 | #include <cstdarg> | ||
41 | #else | ||
42 | #include <stdarg.h> | ||
43 | #endif | ||
44 | #ifdef HAVE_CSTRING | ||
45 | #include <cstring> | ||
46 | #else | ||
47 | #include <string.h> | ||
48 | #endif | ||
49 | 36 | ||
50 | using std::string; | 37 | using std::string; |
51 | 38 | ||
52 | namespace { | 39 | namespace { |
53 | 40 | ||
54 | XFontSet createFontSet(const char *fontname, bool& utf8mode) { | 41 | XFontSet createFontSet(const char *fontname, bool& utf8mode) { |
42 | |||
55 | Display *display = FbTk::App::instance()->display(); | 43 | Display *display = FbTk::App::instance()->display(); |
56 | XFontSet fs; | 44 | XFontSet fs = 0; |
57 | char **missing; | 45 | char **missing; |
58 | const char *constdef = "-"; | 46 | const char *constdef = "-"; |
59 | char *def = const_cast<char *>(constdef); | 47 | char *def = const_cast<char *>(constdef); |