diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 08:55:31 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-27 08:55:31 +0000 |
| commit | 4aa64b35fa75eb7fb2c953b557d950766386f17b (patch) | |
| tree | f41a045430c4551542c334d860650e879fd5258d /ext/nkf/nkf-utf8/nkf.h | |
| parent | b1e6c052cdbac72b3aeab3d6d06dc035d4a26985 (diff) | |
* ext/nkf/nkf.c: raise error when no output encoding is given.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf/nkf-utf8/nkf.h')
| -rwxr-xr-x | ext/nkf/nkf-utf8/nkf.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h index 30efd4b5dd..a27015416f 100755 --- a/ext/nkf/nkf-utf8/nkf.h +++ b/ext/nkf/nkf-utf8/nkf.h @@ -5,7 +5,6 @@ * $Id: nkf.h,v 1.2 2008/01/23 09:10:25 naruse Exp $
*/
-
#ifndef NKF_H
/* Wrapper of configurations */
@@ -144,10 +143,16 @@ void setbinmode(FILE *fp) #endif
#endif
+#ifdef DEFAULT_CODE_LOCALE
+
#ifndef __WIN32__ /* not win32 is posix */
+#ifndef HAVE_LANGINFO_H
#define HAVE_LANGINFO_H
+#endif
+#ifndef HAVE_LOCALE_H
#define HAVE_LOCALE_H
#endif
+#endif
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
@@ -156,6 +161,8 @@ void setbinmode(FILE *fp) #include <locale.h>
#endif
+#endif /* DEFAULT_CODE_LOCALE */
+
#define FALSE 0
#define TRUE 1
@@ -163,4 +170,5 @@ void setbinmode(FILE *fp) #include "nkf32.h"
#endif
-#endif
+#endif /* NKF_H */
+
|