Mercurial > hg > xemacs-beta

diff lib-src/hexl.c @ 410:de805c49cfc1 r21-2-35
Import from CVS: tag r21-2-35
author: cvs
date: Mon, 13 Aug 2007 11:19:21 +0200
parents: 74fd4e045ea6
children: 697ef44129c6
--- a/lib-src/hexl.c	Mon Aug 13 11:18:12 2007 +0200
+++ b/lib-src/hexl.c	Mon Aug 13 11:19:21 2007 +0200
@@ -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 @@
 	{
 	  char buf[18];
 
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 	  _setmode (_fileno (stdout), O_BINARY);
 #endif
 	  for (;;)
@@ -185,7 +187,7 @@
 	}
       else
 	{
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 	  _setmode (_fileno (fp), O_BINARY);
 #endif
 	  address = 0;
@@ -242,7 +244,7 @@
 }
 
 void
-usage ()
+usage (void)
 {
   (void) fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
   exit (1);