--- libelwix/inc/elwix/apio.h	2013/12/05 15:38:14	1.1.2.5
+++ libelwix/inc/elwix/apio.h	2015/06/25 00:36:47	1.3.20.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: apio.h,v 1.1.2.5 2013/12/05 15:38:14 misho Exp $
+* $Id: apio.h,v 1.3.20.1 2015/06/25 00:36:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2015
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,10 @@ SUCH DAMAGE.
 
 
 struct tagPIOPID {
-	FILE			*fp;
+	union {
+		FILE		*fp;
+		int		fd;
+	} f;
 	pid_t			pid;
 	int			stat;
 
@@ -68,14 +71,22 @@ extern pio_pid_t pio_pidlist;
  * @ppid = return pid of child program
  * return: NULL error or !=NULL open program
  */
+#ifdef POPEN_STREAM
 FILE *e_popen(const char *command, const char *type, pid_t *ppid);
+#else
+int e_popen(const char *command, const char *type, pid_t *ppid);
+#endif
 /*
  * e_pclose() - ELWIX replacement of standard pclose
  *
  * @iop = popen handle
  * return: -1 error or !=-1 pid status
  */
+#ifdef POPEN_STREAM
 int e_pclose(FILE *iop);
+#else
+int e_pclose(int iop);
+#endif
 
 /*
  * pio_pgetpid() - Get tagPIOPID structure from file handle
@@ -83,7 +94,11 @@ int e_pclose(FILE *iop);
  * @iop = popen handle
  * return: NULL error or !=NULL tagPIOPID structure
  */
-struct tagPIOPID *pio_pgetpid(FILE * __restrict iop);
+#ifdef POPEN_STREAM
+struct tagPIOPID *pio_pgetpid(FILE *iop);
+#else
+struct tagPIOPID *pio_pgetpid(int iop);
+#endif
 /*
  * pio_pchkpid() - Check exit status of child programs
  *