X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=blobdiff_plain;f=nkf.h;h=7f41361760b1db6f14cf77d12e2bb219c3bce122;hp=2615dd88ff9e04d9d5330f7c42f3477453feb429;hb=832e032be763ec6acf1cf13225b0d72f1b867a18;hpb=1e755758293683429714fa89ddfc95510e44594d

diff --git a/nkf.h b/nkf.h
index 2615dd8..7f41361 100755
--- a/nkf.h
+++ b/nkf.h
@@ -2,10 +2,11 @@
  * 
  * nkf.h - Header file for nkf
  * 
- * $Id: nkf.h,v 1.5 2008/11/07 02:37:21 naruse Exp $
+ * $Id: nkf.h,v 1.6 2008/11/07 02:43:43 naruse Exp $
  */
 
 #ifndef NKF_H
+#define NKF_H
 
 /* Wrapper of configurations */
 
@@ -17,21 +18,9 @@
 #endif
 
 #if DEFAULT_NEWLINE == 0x0D0A
-#define PUT_NEWLINE(func) do {\
-    func(0x0D);\
-    func(0x0A);\
-} while (0)
-#define OCONV_NEWLINE(func) do {\
-    func(0, 0x0D);\
-    func(0, 0x0A);\
-} while (0)
 #elif DEFAULT_NEWLINE == 0x0D
-#define PUT_NEWLINE(func) func(0x0D)
-#define OCONV_NEWLINE(func) func(0, 0x0D)
 #else
 #define DEFAULT_NEWLINE 0x0A
-#define PUT_NEWLINE(func) func(0x0A)
-#define OCONV_NEWLINE(func) func(0, 0x0A)
 #endif
 #ifdef HELP_OUTPUT_STDERR
 #define HELP_OUTPUT stderr
@@ -94,7 +83,7 @@ void  setbinmode(FILE *fp)
 #define setbinmode(fp) setmode(fileno(fp), O_BINARY)
 #endif
 #else /* UNIX */
-#define setbinmode(fp)
+#define setbinmode(fp) (void)(fp)
 #endif
 
 #ifdef _IOFBF /* SysV and MSDOS, Windows */
@@ -173,7 +162,6 @@ void  setbinmode(FILE *fp)
 # endif
 #endif
 
-
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif