diff options
author | erdgeist <> | 2010-08-27 13:27:18 +0000 |
---|---|---|
committer | erdgeist <> | 2010-08-27 13:27:18 +0000 |
commit | a2e3e32235f40f135e34906db887428a3dc52e5a (patch) | |
tree | 73ead3a300a8c0a6d99d8fdc040dd1e845d7a9cd | |
parent | f2ac28407ad81b805dada001b862b2fe130c9dcc (diff) |
Make locale options non-optional. Everyone's expected to have locale.h nowadays.
-rwxr-xr-x | vchat-client.c | 3 | ||||
-rwxr-xr-x | vchat-protocol.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/vchat-client.c b/vchat-client.c index 05e0b3d..c6fa34d 100755 --- a/vchat-client.c +++ b/vchat-client.c | |||
@@ -26,9 +26,6 @@ | |||
26 | #include <errno.h> | 26 | #include <errno.h> |
27 | #include <signal.h> | 27 | #include <signal.h> |
28 | #include <readline/readline.h> | 28 | #include <readline/readline.h> |
29 | #ifndef NO_LOCALE | ||
30 | #include <locale.h> | ||
31 | #endif | ||
32 | #include "vchat.h" | 29 | #include "vchat.h" |
33 | 30 | ||
34 | /* version of this module */ | 31 | /* version of this module */ |
diff --git a/vchat-protocol.c b/vchat-protocol.c index ef035fe..1a29b07 100755 --- a/vchat-protocol.c +++ b/vchat-protocol.c | |||
@@ -26,10 +26,8 @@ | |||
26 | #include <readline/readline.h> | 26 | #include <readline/readline.h> |
27 | #include <openssl/ssl.h> | 27 | #include <openssl/ssl.h> |
28 | #include <openssl/err.h> | 28 | #include <openssl/err.h> |
29 | #ifndef NO_LOCALE | ||
30 | #include <locale.h> | 29 | #include <locale.h> |
31 | #include <langinfo.h> | 30 | #include <langinfo.h> |
32 | #endif | ||
33 | 31 | ||
34 | /* local includes */ | 32 | /* local includes */ |
35 | #include "vchat.h" | 33 | #include "vchat.h" |
@@ -243,11 +241,9 @@ pubthoughts (char *message) | |||
243 | static void | 241 | static void |
244 | serverlogin (char *message) | 242 | serverlogin (char *message) |
245 | { | 243 | { |
246 | #ifndef NO_LOCALE | ||
247 | int utf8=!strcmp(nl_langinfo(CODESET), "UTF-8"); | 244 | int utf8=!strcmp(nl_langinfo(CODESET), "UTF-8"); |
248 | if (utf8) | 245 | if (utf8) |
249 | networkoutput(".e utf8"); | 246 | networkoutput(".e utf8"); |
250 | #endif | ||
251 | } | 247 | } |
252 | 248 | ||
253 | /* parse and handle an idle message | 249 | /* parse and handle an idle message |