support for iPhone callbacks

[wxWidgets.git] / src / tiff / tools / ppm2tiff.c

diff --git a/src/tiff/tools/ppm2tiff.c b/src/tiff/tools/ppm2tiff.c
index 3ca6ef76314ca099ddcac75ca10520e7a4ef0a2a..8910e768f6dc6a0fe74f615c784caf969dd50623 100644 (file)
--- a/src/tiff/tools/ppm2tiff.c
+++ b/src/tiff/tools/ppm2tiff.c
@@ -35,18 +35,24 @@
 # include <unistd.h>
 #endif
 
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_IO_H
+# include <io.h>
+#endif
+
+#ifdef NEED_LIBPORT
+# include "libport.h"
+#endif
+
 #include "tiffio.h"
 
 #ifndef HAVE_GETOPT
 extern int getopt(int, char**, char*);
 #endif
 
-#if defined(_WINDOWS) || defined(MSDOS)
-#define BINMODE "b"
-#else
-#define        BINMODE
-#endif
-
 #define        streq(a,b)      (strcmp(a,b) == 0)
 #define        strneq(a,b,n)   (strncmp(a,b,n) == 0)
 
@@ -116,7 +122,7 @@ main(int argc, char* argv[])
         */
        if (argc - optind > 1) {
                infile = argv[optind++];
-               in = fopen(infile, "r" BINMODE);
+               in = fopen(infile, "rb");
                if (in == NULL) {
                        fprintf(stderr, "%s: Can not open.\n", infile);
                        return (-1);
@@ -124,6 +130,9 @@ main(int argc, char* argv[])
        } else {
                infile = "<stdin>";
                in = stdin;
+#if defined(HAVE_SETMODE) && defined(O_BINARY)
+               setmode(fileno(stdin), O_BINARY);
+#endif
        }
 
        if (fgetc(in) != 'P')
@@ -164,7 +173,7 @@ main(int argc, char* argv[])
                if (c == '#') {
                        do {
                            c = fgetc(in);
-                       } while(!strchr("\r\n", c) || feof(in));
+                       } while(!(strchr("\r\n", c) || feof(in)));
                        continue;
                }
 
@@ -348,3 +357,10 @@ usage(void)
 }
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */