projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use `=>ucs' instead of `->ucs'.
[chise/xemacs-chise.git-]
/
lib-src
/
hexl.c
diff --git
a/lib-src/hexl.c
b/lib-src/hexl.c
index
0a88b00
..
2389bad
100644
(file)
--- a/
lib-src/hexl.c
+++ b/
lib-src/hexl.c
@@
-1,16
+1,19
@@
/* Synched up with: FSF 19.28. */
/* Synched up with: FSF 19.28. */
-#include <../src/config.h>
+#include <config.h>
#include <stdio.h>
#include <ctype.h>
#include <stdio.h>
#include <ctype.h>
-#ifdef MSDOS
+#ifdef WIN32_NATIVE
+#include <io.h>
#include <fcntl.h>
#endif
#if __STDC__ || defined(STDC_HEADERS)
#include <stdlib.h>
#include <fcntl.h>
#endif
#if __STDC__ || defined(STDC_HEADERS)
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
+#endif
#include <string.h>
#endif
#include <string.h>
#endif
@@
-141,13
+144,12
@@
main (int argc, char *argv[])
{
char buf[18];
{
char buf[18];
-#ifdef MSDOS
- (stdout)->_flag &= ~_IOTEXT; /* print binary */
- _setmode (fileno (stdout), O_BINARY);
+#ifdef WIN32_NATIVE
+ _setmode (_fileno (stdout), O_BINARY);
#endif
for (;;)
{
#endif
for (;;)
{
- register int i, c, d;
+ register int i, c = 0, d;
#define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
#define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
@@
-185,16
+187,15
@@
main (int argc, char *argv[])
}
else
{
}
else
{
-#ifdef MSDOS
- (fp)->_flag &= ~_IOTEXT; /* read binary */
- _setmode (fileno (fp), O_BINARY);
+#ifdef WIN32_NATIVE
+ _setmode (_fileno (fp), O_BINARY);
#endif
address = 0;
string[0] = ' ';
string[17] = '\0';
for (;;)
{
#endif
address = 0;
string[0] = ' ';
string[17] = '\0';
for (;;)
{
- register int i, c;
+ register int i, c = 0;
for (i=0; i < 16; ++i)
{
for (i=0; i < 16; ++i)
{
@@
-243,8
+244,8
@@
main (int argc, char *argv[])
}
void
}
void
-usage ()
+usage (void)
{
{
- (void) fprintf (stderr, "usage: %s [-de] [-iso]\n", progname);
+ fprintf (stderr, "Usage: %s [-de] [-iso]\n", progname);
exit (1);
}
exit (1);
}