--- rpl/src/rpl.h	2010/08/31 09:51:30	1.66
+++ rpl/src/rpl.h	2010/09/08 17:18:37	1.69
@@ -98,7 +98,7 @@
 #		include <sys/shm.h>
 #	endif
 
-#	ifndef SEMAPHORES_SYSV
+#	ifndef IPCS_SYSV
 #		include <semaphore.h>
 #	else
 #		include <sys/ipc.h>
@@ -241,10 +241,10 @@
 
 #ifdef OS2
 #	define readline(s) readline_wrapper(s)
-	unsigned char readline_wrapper(unsigned char *s);
+	unsigned char *readline_wrapper(unsigned char *s);
 #endif
 
-#if ! defined(UNION_SEMUN) && defined(SEMAPHORES_SYSV)
+#if ! defined(UNION_SEMUN) && defined(IPCS_SYSV)
 union semun
 {
 	int					val;
@@ -261,7 +261,7 @@ union semun
 ================================================================================
 */
 
-#ifdef SEMAPHORES_SYSV
+#ifdef IPCS_SYSV
 #	define sem_init(a, b, c)	sem_init_SysV(a, b, c)
 #	define sem_destroy(a)		sem_destroy_SysV(a)
 #	define sem_wait(a)			sem_wait_SysV(a)
@@ -502,6 +502,9 @@ int sem_getvalue2(sem_t *semaphore, int
 #	define fopen(...) ({ FILE *desc; \
 	        while((desc = fopen(__VA_ARGS__)) == NULL) \
 	        { if ((errno != EINTR) && (errno != 0)) break; } desc; })
+#	define freopen(...) ({ FILE *desc; \
+	        while((desc = freopen(__VA_ARGS__)) == NULL) \
+	        { if ((errno != EINTR) && (errno != 0)) break; } desc; })
 #	define fclose(...) ({ int ios; \
 	        while((ios = fclose(__VA_ARGS__)) != 0) \
 	        { if ((errno != EINTR) && (errno != 0)) break; } ios; })