all repos — fluxbox @ 53b3120b322603c317a0ea9cd88e5a7cefe604ee

custom fork of the fluxbox windowmanager

Move nls globals into #ifdef NLS
Mathias Gumz akira@fluxbox.org
commit

53b3120b322603c317a0ea9cd88e5a7cefe604ee

parent

461d4b7dbd9bc8c651eb3cf28ffe8708dca16c5e

1 files changed, 8 insertions(+), 3 deletions(-)

jump to
M src/FbTk/I18n.ccsrc/FbTk/I18n.cc

@@ -66,14 +66,13 @@ using std::string;

namespace { +#if defined(NLS) + const char UTF8_SUFFIX[] = "-UTF-8.cat"; const size_t UTF8_SUFFIX_LEN = sizeof(UTF8_SUFFIX)-1; // without \0 const char DEFAULT_CATFILE[] = "fluxbox.cat"; const char ENV_CATFILE[] = "FLUXBOX_CATFILE"; const char ENV_CATDIR[] = "FLUXBOX_CATDIR"; - -const nl_catd INVALID_CATALOG = (nl_catd)(-1); -nl_catd s_catalog_fd = INVALID_CATALOG; const char* getCatalogDir() {

@@ -83,6 +82,12 @@ return cat_dir;

} return LOCALEPATH; } + +#endif + + +const nl_catd INVALID_CATALOG = (nl_catd)(-1); +nl_catd s_catalog_fd = INVALID_CATALOG; std::string join_str(size_t n, ...) {