1 files changed, 9 insertions, 17 deletions
diff --git a/pc/popen.h b/pc/popen.h
index 0ec5756b..99f00169 100644
--- a/pc/popen.h
+++ b/pc/popen.h
@@ -1,21 +1,13 @@
 /*
 ** popen.h -- prototypes for pipe functions
 */
-
-#if defined (OS2) && !defined(MSDOS)  /* OS/2, but not family mode */
-# if defined (_MSC_VER)
-#  define popen(c, m)	_popen(c, m)
-#  define pclose(f)	_pclose(f)
+#if !defined (__DJGPP__)
+# if defined (popen)
+#  undef popen
+#  undef pclose
 # endif
-#else
-# if !defined (__GO32__)
-#  if defined (popen)
-#   undef popen
-#   undef pclose
-#  endif
-#  define popen(c, m)	os_popen(c, m)
-#  define pclose(f)	os_pclose(f)
-   extern FILE *os_popen( const char *, const char * );
-   extern int  os_pclose( FILE * );
-# endif
-#endif
+# define popen(c, m)	os_popen(c, m)
+# define pclose(f)	os_pclose(f)
+  extern FILE *os_popen( const char *, const char * );
+  extern int  os_pclose( FILE * );
+#endif	/* !__DJGPP__ */