projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store variable names, labels and value labels as UTF8.
[pspp-builds.git]
/
src
/
libpspp
/
i18n.c
diff --git
a/src/libpspp/i18n.c
b/src/libpspp/i18n.c
index 64aa005612627bbc223b155abc5075e8c32e9186..60189ff76eb6e983c0958af83916a4bd1fe57469 100644
(file)
--- a/
src/libpspp/i18n.c
+++ b/
src/libpspp/i18n.c
@@
-24,6
+24,7
@@
#include <libintl.h>
#include <iconv.h>
#include <errno.h>
#include <libintl.h>
#include <iconv.h>
#include <errno.h>
+#include <relocatable.h>
#include "assertion.h"
#include "hmapx.h"
#include "hash-functions.h"
#include "assertion.h"
#include "hmapx.h"
#include "hash-functions.h"
@@
-56,6
+57,7
@@
create_iconv (const char* tocode, const char* fromcode)
size_t hash;
struct hmapx_node *node;
struct converter *converter;
size_t hash;
struct hmapx_node *node;
struct converter *converter;
+ assert (fromcode);
hash = hash_string (tocode, hash_string (fromcode, 0));
HMAPX_FOR_EACH_WITH_HASH (converter, node, hash, &map)
hash = hash_string (tocode, hash_string (fromcode, 0));
HMAPX_FOR_EACH_WITH_HASH (converter, node, hash, &map)
@@
-196,7
+198,7
@@
i18n_init (void)
#if HAVE_LC_PAPER
setlocale (LC_PAPER, "");
#endif
#if HAVE_LC_PAPER
setlocale (LC_PAPER, "");
#endif
- bindtextdomain (PACKAGE,
locale_dir
);
+ bindtextdomain (PACKAGE,
relocate(locale_dir)
);
textdomain (PACKAGE);
#endif /* ENABLE_NLS */
textdomain (PACKAGE);
#endif /* ENABLE_NLS */