import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

[chise/xemacs-chise.git.1] / lib-src / hexl.c

diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index a6dddd9..b254d85 100644 (file)
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -4,14 +4,16 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 #include <io.h>
 #include <fcntl.h>
 #endif
 
 #if __STDC__ || defined(STDC_HEADERS)
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <string.h>
 #endif
 
@@ -142,7 +144,7 @@ main (int argc, char *argv[])
        {
          char buf[18];
 
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
          _setmode (_fileno (stdout), O_BINARY);
 #endif
          for (;;)
@@ -185,7 +187,7 @@ main (int argc, char *argv[])
        }
       else
        {
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
          _setmode (_fileno (fp), O_BINARY);
 #endif
          address = 0;
@@ -242,7 +244,7 @@ main (int argc, char *argv[])
 }
 
 void
-usage ()
+usage (void)
 {
   (void) fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
   exit (1);