Rebase Stable series to current Advanced: 10.47.04

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@995 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 3 insertions, 10 deletions

diff --git a/converter/other/pamtotiff.c b/converter/other/pamtotiff.c
index 49123d4f..9fac4b47 100644
--- a/converter/other/pamtotiff.c
+++ b/converter/other/pamtotiff.c
@@ -791,16 +791,6 @@ createTiffGenerator(int          const ofd,
 
     const char * option;
 
-    /* Before 10.12 (November 2002), we set O_NONBLOCK here:
-
-       fcntl( 1, F_SETFL, O_NONBLOCK ) ; 
-   
-       I have no idea why.  The comment attached said, 
-
-         acooke dec99 - otherwise blocks on read inside 
-         next line (Linux i386) 
-    */
-
     validateSeekableOutputFile(ofd, outFileName);
 
     if (append)
@@ -1034,6 +1024,8 @@ validateReadableStdout(void) {
   error message about a file I/O error.  We, on the other hand, produce
   a helpful error message.
 -----------------------------------------------------------------------------*/
+#if !defined(WIN32) || defined(__CYGWIN__)
+
     int flags;
 
     flags = fcntl(STDOUT_FILENO, F_GETFL);
@@ -1048,6 +1040,7 @@ validateReadableStdout(void) {
                      "In order to create a multi-image TIFF stream, "
                      "Standard Output must be both readable and writable.");
     }
+#endif
 }