--- ./rw/writeGIF.c.orig	2002-10-07 13:18:47.000000000 -0700
+++ ./rw/writeGIF.c	2003-09-07 16:04:52.000000000 -0700
@@ -40,9 +40,7 @@
 #include <stdio.h>
 #include "image.h"
 #include "rwTable.h"
-#ifdef __EMX__
 #include <errno.h>
-#endif
 
 #define MAXCOLORS 256
 
@@ -84,9 +82,7 @@
 int
 WriteGIF(char *file, Image * outImage)
 {
-#ifndef __EMX__
     extern int errno;
-#endif
     int r[MAXCOLORS], g[MAXCOLORS], b[MAXCOLORS];
     int i, bpp;
     FILE *fp;
--- ./rw/libpnmrw.c.orig	2002-12-15 02:41:26.000000000 -0800
+++ ./rw/libpnmrw.c	2003-09-07 16:04:37.000000000 -0700
@@ -49,9 +49,7 @@
 
 void *malloc(int);
 void free(void *);
-#if defined(__EMX__) || defined(__CYGWIN__)
 #include <errno.h>
-#endif
 
 
 /* Definitions. */
@@ -147,9 +145,7 @@
 #endif
 #endif
 #endif
-#if !defined(__EMX__) || defined(__CYGWIN__)
     extern int errno;
-#endif
     char *e;
 
     e = (char *)sys_errlist[errno];