1 files changed, 21 insertions, 9 deletions
diff --git a/pc/popen.h b/pc/popen.h
index e8cd1b9b..3735f455 100644
--- a/pc/popen.h
+++ b/pc/popen.h
@@ -1,9 +1,21 @@
-/*
-** popen.h -- prototypes for pipe functions
-*/
-#if !defined(FILE)
-#include <stdio.h>
-#endif
-
-extern FILE *os_popen( char *, char * );
-extern int  os_pclose( FILE * );
+/*
+** 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)
+# 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( char *, char * );
+   extern int  os_pclose( FILE * );
+# endif
+#endif