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 */
+