--- rpl/src/instructions_s9.c	2010/04/07 13:45:09	1.7
+++ rpl/src/instructions_s9.c	2010/04/17 18:57:36	1.8
@@ -992,15 +992,27 @@ instruction_suspend(struct_processus *s_
 		}
 	}
 
+#	ifndef SEMAPHORES_NOMMES
 	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 	{
 		(*s_etat_processus).erreur_systeme = d_es_processus;
 		return;
 	}
+#	else
+	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+	{
+		(*s_etat_processus).erreur_systeme = d_es_processus;
+		return;
+	}
+#	endif
 
 	sigsuspend(&masque);
 
+#	ifndef SEMAPHORES_NOMMES
 	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#	else
+	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#	endif
 	{
 		if (errno != EINTR)
 		{
@@ -1365,17 +1377,29 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
+#			ifndef SEMAPHORES_NOMMES
 			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+#			else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_objets_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
+#				ifndef SEMAPHORES_NOMMES
 				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#				else
+				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#				endif
 				{
 					if (errno != EINTR)
 					{
@@ -1406,14 +1430,22 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
+#				ifndef SEMAPHORES_NOMMES
 				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
 			}
 
+#			ifndef SEMAPHORES_NOMMES
 			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#			else
+			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#			endif
 			{
 				if (errno != EINTR)
 				{
@@ -1429,17 +1461,29 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
+#			ifndef SEMAPHORES_NOMMES
 			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+#			else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_objets_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
+#				ifndef SEMAPHORES_NOMMES
 				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#				else
+				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#				endif
 				{
 					if (errno != EINTR)
 					{
@@ -1470,14 +1514,26 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
+#				ifndef SEMAPHORES_NOMMES
 				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+#				else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
+#				endif
 			}
 
+#			ifndef SEMAPHORES_NOMMES
 			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#			else
+			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#			endif
 			{
 				if (errno != EINTR)
 				{
@@ -1492,18 +1548,30 @@ instruction_swi(struct_processus *s_etat
 		attente.tv_sec = 0;
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
+#		ifndef SEMAPHORES_NOMMES
 		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
+#		else
+		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+#		endif
 
 		while((longueur_ecriture = write_atomic(s_etat_processus,
 				(*s_etat_processus).pipe_interruptions,
 				&interruption_reduite, sizeof(interruption_reduite)))
 				!= sizeof(interruption_reduite))
 		{
+#			ifndef SEMAPHORES_NOMMES
 			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#			else
+			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#			endif
 			{
 				if (errno != EINTR)
 				{
@@ -1534,14 +1602,26 @@ instruction_swi(struct_processus *s_etat
 			nanosleep(&attente, NULL);
 			INCR_GRANULARITE(attente.tv_nsec);
 
+#			ifndef SEMAPHORES_NOMMES
 			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+#			else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+#			endif
 		}
 
+#		ifndef SEMAPHORES_NOMMES
 		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#		else
+		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#		endif
 		{
 			if (errno != EINTR)
 			{
@@ -1557,18 +1637,29 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
+#			ifndef SEMAPHORES_NOMMES
 			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+#			else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
-				while(sem_wait(&((*s_etat_processus).semaphore_fork))
-						== -1)
+#				ifndef SEMAPHORES_NOMMES
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#				else
+				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
@@ -1596,11 +1687,19 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
+#				ifndef SEMAPHORES_NOMMES
 				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+#				else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
+#				endif
 			}
 
 			pid = getpid();
@@ -1612,7 +1711,11 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
+#				ifndef SEMAPHORES_NOMMES
 				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#				else
+				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#				endif
 				{
 					if (errno != EINTR)
 					{
@@ -1643,14 +1746,26 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
+#				ifndef SEMAPHORES_NOMMES
 				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+#				else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
+#				endif
 			}
 
+#			ifndef SEMAPHORES_NOMMES
 			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#			else
+			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#			endif
 			{
 				if (errno != EINTR)
 				{
@@ -1663,17 +1778,29 @@ instruction_swi(struct_processus *s_etat
 		{
 			tid = -3;
 
+#			ifndef SEMAPHORES_NOMMES
 			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+#			else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
+#				ifndef SEMAPHORES_NOMMES
 				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#				else
+				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#				endif
 				{
 					if (errno != EINTR)
 					{
@@ -1704,11 +1831,19 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
+#				ifndef SEMAPHORES_NOMMES
 				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+#				else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
+#				endif
 			}
 
 			tid = pthread_self();
@@ -1720,7 +1855,11 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
+#				ifndef SEMAPHORES_NOMMES
 				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#				else
+				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#				endif
 				{
 					if (errno != EINTR)
 					{
@@ -1752,14 +1891,26 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
+#				ifndef SEMAPHORES_NOMMES
 				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+#				else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
+#				endif
 			}
 
+#			ifndef SEMAPHORES_NOMMES
 			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#			else
+			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#			endif
 			{
 				if (errno != EINTR)
 				{
@@ -1772,17 +1923,29 @@ instruction_swi(struct_processus *s_etat
 		attente.tv_sec = 0;
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
+#		ifndef SEMAPHORES_NOMMES
 		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
+#		else
+		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+#		endif
 
 		while(read_atomic(s_etat_processus,
 				(*s_etat_processus).pipe_acquittement,
 				&tampon, sizeof(unsigned char)) != sizeof(unsigned char))
 		{
+#			ifndef SEMAPHORES_NOMMES
 			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#			else
+			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#			endif
 			{
 				if (errno != EINTR)
 				{
@@ -1794,14 +1957,22 @@ instruction_swi(struct_processus *s_etat
 			nanosleep(&attente, NULL);
 			INCR_GRANULARITE(attente.tv_nsec);
 
+#			ifndef SEMAPHORES_NOMMES
 			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
 		}
 
+#		ifndef SEMAPHORES_NOMMES
 		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
+#		else
+		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
+#		endif
 		{
 			if (errno != EINTR)
 			{