--- rpl/src/rpl.h	2011/09/19 17:33:17	1.126
+++ rpl/src/rpl.h	2011/09/20 15:45:53	1.131
@@ -101,52 +101,51 @@
 #	include <pwd.h>
 #	include <sys/shm.h>
 
-#	ifndef __RPLCAS
-#		ifndef IPCS_SYSV
-#			include <semaphore.h>
-#		else
-#			include <sys/ipc.h>
-#			include <sys/sem.h>
-
-#			ifdef OS2
-#				define INCL_DOSSEMAPHORES
-#				define INCL_DOSMEMMGR
-#				define INCL_DOSERRORS
-#				include <os2.h>
-
-				typedef struct _OS2SEM
-				{
-					HMTX	hmtx;
-					HEV		hev;
-					ULONG	shared;
-					ULONG	*cnt;
-					ULONG	*nopened;
-					ULONG	allocated;
-				} sem_t;
-#			else // IPCS_SYSV
-				typedef struct
-			   	{
-					int				sem;
-					int				alloue;
-					unsigned char	*path;
-					pid_t			pid;
-				} sem_t;
-#			endif
+#	ifndef IPCS_SYSV
+#		include <semaphore.h>
+#	else
+#		include <sys/ipc.h>
+#		include <sys/sem.h>
 
-#			ifndef SEM_FAILED
-#				define SEM_FAILED	NULL
-#			endif
+#		ifdef OS2
+#			define INCL_DOSSEMAPHORES
+#			define INCL_DOSMEMMGR
+#			define INCL_DOSERRORS
+#			include <os2.h>
+
+			typedef struct _OS2SEM
+			{
+				HMTX	hmtx;
+				HEV		hev;
+				ULONG	shared;
+				ULONG	*cnt;
+				ULONG	*nopened;
+				ULONG	allocated;
+			} sem_t;
+#		else // IPCS_SYSV
+			typedef struct
+		   	{
+				int				sem;
+				int				alloue;
+				unsigned char	*path;
+				pid_t			pid;
+				pthread_t		tid;
+			} sem_t;
+#		endif
 
-			sem_t *sem_open_SysV(const char *nom, int oflag, ...);
-			int sem_init_SysV(sem_t *sem, int shared, unsigned int value);
-			int sem_close_SysV(sem_t *sem);
-			int sem_wait_SysV(sem_t *sem);
-			int sem_trywait_SysV(sem_t *sem);
-			int sem_post_SysV(sem_t *sem);
-			int sem_getvalue_SysV(sem_t *sem, int *value);
-			int sem_unlink_SysV(const char *nom);
-			int sem_destroy_SysV(sem_t *sem);
+#		ifndef SEM_FAILED
+#			define SEM_FAILED	NULL
 #		endif
+
+		sem_t *sem_open_SysV(const char *nom, int oflag, ...);
+		int sem_init_SysV(sem_t *sem, int shared, unsigned int value);
+		int sem_close_SysV(sem_t *sem);
+		int sem_wait_SysV(sem_t *sem);
+		int sem_trywait_SysV(sem_t *sem);
+		int sem_post_SysV(sem_t *sem);
+		int sem_getvalue_SysV(sem_t *sem, int *value);
+		int sem_unlink_SysV(const char *nom);
+		int sem_destroy_SysV(sem_t *sem);
 #	endif
 
 #	include <setjmp.h>
@@ -454,10 +453,15 @@ typedef unsigned char			t_8_bits;
 #endif
 
 #ifdef SEMAPHORES_NOMMES
-sem_t *sem_init2(unsigned int valeur, pid_t pid);
-int sem_destroy2(sem_t *semaphore_p, pid_t pid);
+#define SEM_FORK			0
+#define	SEM_QUEUE			1
+#define	SEM_SIGNAUX			2
+sem_t *sem_init2(unsigned int valeur, pid_t pid, int ordre);
+sem_t *sem_init3(unsigned int valeur, pid_t pid, pthread_t tid, int ordre);
+int sem_destroy2(sem_t *semaphore_p, pid_t pid, int ordre);
+int sem_destroy3(sem_t *semaphore_p, pid_t pid, pthread_t tid, int ordre);
 int sem_getvalue2(sem_t *semaphore, int *valeur);
-sem_t *sem_open2(pid_t pid);
+sem_t *sem_open2(pid_t pid, int ordre);
 
 // Le mutex est là uniquement pour pouvoir émuler le comportement
 // de sem_getvalue() sur un système comme MacOS X qui ne possède pas
@@ -2178,7 +2182,11 @@ typedef struct processus
 	pthread_mutex_t				mutex_allocation;
 
 	// Mutex autorisant les fork()
-	pthread_mutex_t				mutex_fork;
+	sem_t
+#	ifdef SEMAPHORES_NOMMES
+		*
+#	endif
+		 						semaphore_fork;
 
 /* Mutexes											*/