--- rpl/src/rpl.h	2010/08/22 16:38:36	1.60
+++ rpl/src/rpl.h	2010/08/26 17:49:34	1.63
@@ -193,9 +193,11 @@
 
 #include "librplprototypes.h"
 
-#ifndef UNIX_PATH_MAX
-	struct sockaddr_un sizecheck;
-#	define UNIX_PATH_MAX sizeof(sizecheck.sun_path)
+#ifndef RPLARGS
+#	ifndef UNIX_PATH_MAX
+		struct sockaddr_un sizecheck;
+#		define UNIX_PATH_MAX sizeof(sizecheck.sun_path)
+#	endif
 #endif
 
 /*
@@ -211,10 +213,21 @@
 #	endif
 #	define SA_SIGINFO	0
 
-#	define kill(pid, signal)			kill_broken_siginfo(pid, signal)
-#	define pthread_kill(tid, signal) 	pthread_kill_broken_siginfo(tid, signal)
+#	ifndef __BROKEN_SIGINFO_ROUTINES__
+
+// pthread_kill() est une macro sous OS/2.
+#		ifdef pthread_kill
+#			undef pthread_kill
+#		endif
+
+#		define kill(a, b)			kill_broken_siginfo(a, b)
+#		define pthread_kill(a, b)	pthread_kill_broken_siginfo(a, b)
+#	endif
+
 	int kill_broken_siginfo(pid_t pid, int signal);
 	int pthread_kill_broken_siginfo(pthread_t tid, int signal);
+	pid_t origine_signal(int signal);
+	int queue_in(pid_t pid, int signal);
 #else
 #	define SIGHANDLER_ARGS	int signal, siginfo_t *siginfo, void *context
 #endif
@@ -226,6 +239,11 @@
 #	define PTHREAD_SCOPE_SYSTEM	0
 #endif
 
+#ifdef OS2
+#	define readline(s) readline_wrapper(s)
+	unsigned char readline_wrapper(unsigned char *s);
+#endif
+
 #if ! defined(UNION_SEMUN) && defined(SEMAPHORES_SYSV)
 union semun
 {