--- rpl/src/rpl.h	2014/04/23 13:43:01	1.239
+++ rpl/src/rpl.h	2014/04/25 08:19:00	1.241
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.17
+  RPL/2 (R) version 4.1.18
   Copyright (C) 1989-2014 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -110,13 +110,13 @@
 #		include <sys/shm.h>
 #	endif
 
-#	ifndef __RPLCAS
-#		ifndef IPCS_SYSV
-#			include <semaphore.h>
-#		else
-#			include <sys/ipc.h>
-#			include <sys/sem.h>
+#	ifndef IPCS_SYSV
+#		include <semaphore.h>
+#	else
+#		include <sys/ipc.h>
+#		include <sys/sem.h>
 
+#		ifndef __RPLCAS
 #			ifdef OS2
 #				define INCL_DOSSEMAPHORES
 #				define INCL_DOSMEMMGR
@@ -140,7 +140,7 @@
 					unsigned char	*path;
 					pid_t			pid;
 					pthread_t		tid;
-					} sem_t;
+				} sem_t;
 #			endif
 
 #			ifndef SEM_FAILED
@@ -459,9 +459,6 @@ union semun
 #ifndef RPLARGS
 #	ifdef SEMAPHORES_NOMMES
 #		define LONGUEUR_NOM_SEMAPHORE	64
-#	endif
-
-#	ifdef SEMAPHORES_NOMMES
 #		define __PTR__		*
 #	else
 #		define __PTR__