--- rpl/src/rpl.h	2014/04/23 13:43:01	1.239
+++ rpl/src/rpl.h	2014/06/09 08:26:29	1.244
@@ -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,54 +110,52 @@
 #		include <sys/shm.h>
 #	endif
 
-#	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;
-					pthread_t		tid;
-					} sem_t;
-#			endif
-
-#			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_timedwait_SysV(sem_t *sem, struct timespec *ts);
-			int sem_post_SysV(sem_t *sem);
-			int sem_getvalue_SysV(sem_t *sem, int *value);
-			int sem_unlink_SysV(char *nom);
-			int sem_destroy_SysV(sem_t *sem);
+#	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;
+				pthread_t		tid;
+			} sem_t;
+#		endif
+
+#		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_timedwait_SysV(sem_t *sem, struct timespec *ts);
+		int sem_post_SysV(sem_t *sem);
+		int sem_getvalue_SysV(sem_t *sem, int *value);
+		int sem_unlink_SysV(char *nom);
+		int sem_destroy_SysV(sem_t *sem);
 #	endif
 
 #	include <setjmp.h>
@@ -459,9 +457,6 @@ union semun
 #ifndef RPLARGS
 #	ifdef SEMAPHORES_NOMMES
 #		define LONGUEUR_NOM_SEMAPHORE	64
-#	endif
-
-#	ifdef SEMAPHORES_NOMMES
 #		define __PTR__		*
 #	else
 #		define __PTR__