--- rpl/src/rpl.h	2010/08/25 09:43:37	1.61
+++ rpl/src/rpl.h	2011/03/12 15:32:03	1.77
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.18
-  Copyright (C) 1989-2010 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.0.21
+  Copyright (C) 1989-2011 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -98,7 +98,7 @@
 #		include <sys/shm.h>
 #	endif
 
-#	ifndef SEMAPHORES_SYSV
+#	ifndef IPCS_SYSV
 #		include <semaphore.h>
 #	else
 #		include <sys/ipc.h>
@@ -213,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
@@ -228,7 +239,12 @@
 #	define PTHREAD_SCOPE_SYSTEM	0
 #endif
 
-#if ! defined(UNION_SEMUN) && defined(SEMAPHORES_SYSV)
+#ifdef OS2
+#	define readline(s) readline_wrapper(s)
+	unsigned char *readline_wrapper(unsigned char *s);
+#endif
+
+#if ! defined(UNION_SEMUN) && defined(IPCS_SYSV)
 union semun
 {
 	int					val;
@@ -245,7 +261,7 @@ union semun
 ================================================================================
 */
 
-#ifdef SEMAPHORES_SYSV
+#ifdef IPCS_SYSV
 #	define sem_init(a, b, c)	sem_init_SysV(a, b, c)
 #	define sem_destroy(a)		sem_destroy_SysV(a)
 #	define sem_wait(a)			sem_wait_SysV(a)
@@ -486,6 +502,9 @@ int sem_getvalue2(sem_t *semaphore, int
 #	define fopen(...) ({ FILE *desc; \
 	        while((desc = fopen(__VA_ARGS__)) == NULL) \
 	        { if ((errno != EINTR) && (errno != 0)) break; } desc; })
+#	define freopen(...) ({ FILE *desc; \
+	        while((desc = freopen(__VA_ARGS__)) == NULL) \
+	        { if ((errno != EINTR) && (errno != 0)) break; } desc; })
 #	define fclose(...) ({ int ios; \
 	        while((ios = fclose(__VA_ARGS__)) != 0) \
 	        { if ((errno != EINTR) && (errno != 0)) break; } ios; })
@@ -926,8 +945,8 @@ pid_t debug_fork();
 #	undef MAX
 #endif
 
-#define	ADR	__RPL_ADR
-#define	ALG	__RPL_ALG
+#define ADR	__RPL_ADR
+#define ALG	__RPL_ALG
 #define BIN	__RPL_BIN
 #define CHN	__RPL_CHN
 #define CPL	__RPL_CPL
@@ -946,9 +965,9 @@ pid_t debug_fork();
 #define RPN	__RPL_RPN
 #define SCK	__RPL_SCK
 #define SLB	__RPL_SLB
-#define SPH __RPL_SPH
+#define SPH	__RPL_SPH
 #define SQL	__RPL_SQL
-#define TBL __RPL_TBL
+#define TBL	__RPL_TBL
 #define VCX	__RPL_VCX
 #define VIN	__RPL_VIN
 #define VRL	__RPL_VRL
@@ -1340,6 +1359,7 @@ typedef struct descripteur_thread
 	pthread_t					thread_pere;
 
 	pthread_mutex_t				mutex;
+	pthread_mutex_t				mutex_nombre_references;
 
 	volatile logical1			thread_actif;
 
@@ -1687,6 +1707,7 @@ typedef struct processus
 	unsigned char				mode_interactif;					/*Y/N*/
 	unsigned char				mode_evaluation_expression;			/*Y/N*/
 	unsigned char				traitement_cycle_exit;				/*N/E/C*/
+	unsigned char				recherche_type;						/*Y/N*/
 
 	unsigned long				position_courante;
 	unsigned long				longueur_definitions_chainees;
@@ -1740,7 +1761,7 @@ typedef struct processus
 
 #	if !defined(Cygwin)
 #		if !(OpenBSD)
-	stack_t						pile_signal;
+			stack_t				pile_signal;
 #		else
 #			ifdef SA_ONSTACK
 #				undef SA_ONSTACK
@@ -1748,8 +1769,8 @@ typedef struct processus
 #			define SA_ONSTACK	0
 #		endif
 #	else
-#	define SA_ONSTACK			0
-#	define RTLD_LOCAL			0
+#		define SA_ONSTACK		0
+#		define RTLD_LOCAL		0
 #	endif
 
 /* Contextes											*/
@@ -2023,6 +2044,7 @@ typedef struct processus
 	volatile sig_atomic_t		var_volatile_traitement_retarde_stop;
 	volatile sig_atomic_t		var_volatile_traitement_sigint;
 
+	volatile sig_atomic_t		var_volatile_processus_racine;
 	volatile sig_atomic_t		var_volatile_processus_pere;
 	volatile sig_atomic_t		var_volatile_recursivite;
 
@@ -2422,6 +2444,7 @@ void instruction_lq(struct_processus *s_
 void instruction_lsq(struct_processus *s_etat_processus);
 void instruction_lt(struct_processus *s_etat_processus);
 void instruction_lu(struct_processus *s_etat_processus);
+void instruction_l_vers_t(struct_processus *s_etat_processus);
 
 void instruction_mant(struct_processus *s_etat_processus);
 void instruction_mark(struct_processus *s_etat_processus);
@@ -2657,6 +2680,7 @@ void instruction_trn(struct_processus *s
 void instruction_trnc(struct_processus *s_etat_processus);
 void instruction_true(struct_processus *s_etat_processus);
 void instruction_type(struct_processus *s_etat_processus);
+void instruction_t_vers_l(struct_processus *s_etat_processus);
 
 void instruction_ucase(struct_processus *s_etat_processus);
 void instruction_uchol(struct_processus *s_etat_processus);
@@ -2958,6 +2982,8 @@ unsigned char *formateur_fichier(struct_
 		struct_objet *s_objet, struct_objet *s_format,
 		long longueur, long longueur_champ, unsigned char format,
 		unsigned char type, long *longueur_effective, long *recursivite);
+unsigned char *formateur_flux(struct_processus *s_etat_processus,
+		unsigned char *donnees, long *longueur);
 unsigned char *formateur_fichier_nombre(struct_processus *s_etat_processus,
 		void *valeur_numerique, unsigned char type,
 		long longueur, long longueur_champ, unsigned char format);