diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
commit | e169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch) | |
tree | ae9e92c7e885791c7f47645184070cbcd441ab94 /src/FbTk/Font.cc | |
parent | c82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff) | |
parent | 91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff) | |
download | fluxbox-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.cc | 3 |
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; | |||
73 | using std::map; | 73 | using std::map; |
74 | using std::list; | 74 | using std::list; |
75 | 75 | ||
76 | namespace { | ||
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 | ||
81 | namespace { | ||
82 | |||
82 | // use to map <font1>|<font2>|<font3> => <fontthatworks> | 83 | // use to map <font1>|<font2>|<font3> => <fontthatworks> |
83 | typedef map<string, string> StringMap; | 84 | typedef map<string, string> StringMap; |
84 | typedef StringMap::iterator StringMapIt; | 85 | typedef StringMap::iterator StringMapIt; |