aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Font.cc
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2008-08-14 05:52:39 (GMT)
commite169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch)
treeae9e92c7e885791c7f47645184070cbcd441ab94 /src/FbTk/Font.cc
parentc82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff)
parent91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff)
downloadfluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip
fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2
Merge branch 'master' into to_push
Diffstat (limited to 'src/FbTk/Font.cc')
-rw-r--r--src/FbTk/Font.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index b21e7c4..f0951ff 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -73,12 +73,13 @@ using std::string;
73using std::map; 73using std::map;
74using std::list; 74using std::list;
75 75
76namespace {
77 76
78#ifdef HAVE_SETLOCALE 77#ifdef HAVE_SETLOCALE
79#include <locale.h> 78#include <locale.h>
80#endif //HAVE_SETLOCALE 79#endif //HAVE_SETLOCALE
81 80
81namespace {
82
82// use to map <font1>|<font2>|<font3> => <fontthatworks> 83// use to map <font1>|<font2>|<font3> => <fontthatworks>
83typedef map<string, string> StringMap; 84typedef map<string, string> StringMap;
84typedef StringMap::iterator StringMapIt; 85typedef StringMap::iterator StringMapIt;