--- rpl/src/rpl.h	2010/02/10 10:14:26	1.8
+++ rpl/src/rpl.h	2010/03/04 17:42:47	1.13
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.11
+  RPL/2 (R) version 4.0.12
   Copyright (C) 1989-2010 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -22,7 +22,12 @@
 
 #ifndef INCLUSION_RPL
 #define INCLUSION_RPL
+
 #define _GNU_SOURCE
+#define _REENTRANT
+
+// Nécessaire pour les systèmes qui ne comprennent pas _GNU_SOURCE
+#define _XOPEN_SOURCE 500
 
 /*
 ================================================================================
@@ -70,6 +75,8 @@
 #	include "termcap.h"
 #	include "iconv.h"
 
+#	include "openssl/evp.h"
+
 #	define HAVE_INLINE
 #	define GSL_RANGE_CHECK_OFF
 #	include "gsl/gsl_cdf.h"
@@ -276,6 +283,17 @@ typedef unsigned char			t_8_bits;
 		__VA_ARGS__; fflush(stdout); \
 		pthread_kill(pthread_self(), SIGBUS); }} while(0)
 
+#define NOTICE(m) \
+	do \
+	{ \
+		ufprintf(stderr, "[%d-%llu] %s() from %s at line %d: %s\n", \
+				getpid(), (unsigned long long) pthread_self(), \
+			   	__FUNCTION__, __FILE__, __LINE__, m); \
+		fflush(stderr); \
+	} while(0)
+
+#ifdef __GLIBC__
+#include <execinfo.h>
 #define BACKTRACE(n) \
 	do \
 	{ \
@@ -300,15 +318,9 @@ typedef unsigned char			t_8_bits;
 		fflush(stdout); \
 		pthread_mutex_unlock(&mutex); \
 	} while(0)
-
-#define NOTICE(m) \
-	do \
-	{ \
-		ufprintf(stderr, "[%d-%llu] %s() from %s at line %d: %s\n", \
-				getpid(), pthread_self(), __FUNCTION__, __FILE__, __LINE__, \
-				m); \
-		fflush(stderr); \
-	} while(0)
+#else
+#define BACKTRACE(n) NOTICE("BACKTRACE only defined in glibc")
+#endif
 
 
 /*
@@ -317,10 +329,24 @@ typedef unsigned char			t_8_bits;
 ================================================================================
 */
 
+#ifdef DEBUG_MEMOIRE
+void *debug_memoire_ajout(size_t taille, const unsigned char *fonction,
+		unsigned long ligne, const unsigned char *argument);
+void *debug_memoire_modification(void *pointeur, size_t taille,
+		const unsigned char *fonction, unsigned long ligne,
+		const unsigned char *argument);
+void debug_memoire_retrait(void *ptr);
+
+#define malloc(s) debug_memoire_ajout(s, __FUNCTION__, __LINE__, #s)
+#define free(s) debug_memoire_retrait(s)
+#define realloc(s, t) debug_memoire_modification(s, t, \
+			__FUNCTION__, __LINE__, #t)
+#endif
+
 #ifdef DEBUG_RETURN
 #define return uprintf("[%d] Return from <%s()> at line #%d " \
 		"(%s [%d])\n", (int) getpid(), __FUNCTION__, \
-		__LINE__, strerror(errno), errno); fflush(stdout); errno=0; return
+		__LINE__, strerror(errno), errno); fflush(stdout); errno = 0; return
 #endif
 
 #ifdef DEBUG_MUTEX
@@ -996,8 +1022,8 @@ typedef struct descripteur_thread
 
 	struct_objet				*argument;
 
-	pid_t					pid;
-	volatile pthread_t		tid;
+	pid_t						pid;
+	volatile pthread_t			tid;
 
 	pthread_t					thread_pere;
 
@@ -1396,7 +1422,12 @@ typedef struct processus
 	pthread_t					thread_fusible;
 	pthread_t					thread_surveille_par_fusible;
 
+#	ifndef Cygwin
 	stack_t						pile_signal;
+#	else
+#	define SA_ONSTACK			0
+#	define RTLD_LOCAL			0
+#	endif
 
 /* Contextes											*/
 
@@ -1672,6 +1703,8 @@ typedef struct processus
 
 /* Autres												*/
 
+	char						*rpl_home;
+
 	gsl_rng						*generateur_aleatoire;
 	const gsl_rng_type			*type_generateur_aleatoire;
 
@@ -2356,6 +2389,7 @@ void conversion_hms_vers_decimal(real8 *
 void conversion_radians_vers_degres(real8 *angle);
 void correction_formateur_tex(struct_processus *s_etat_processus,
 		unsigned char **ligne);
+void debug_memoire_verification(struct_processus *s_etat_processus);
 void depilement_pile_systeme(struct_processus *s_etat_processus);
 void derivation(struct_processus *s_etat_processus,
 		struct_objet **s_expression);
@@ -2493,7 +2527,7 @@ complex16 sommation_vecteur_complexe(com
 */
 
 #ifndef RPLARGS
-int rplinit(int argc, char *argv[], unsigned char ***resultats);
+int rplinit(int argc, char *argv[], unsigned char ***resultats, char *rpl_home);
 #endif
 
 /*
@@ -2596,6 +2630,8 @@ logical1 analyse_syntaxique(struct_proce
 logical1 caracteristiques_fichier(struct_processus *s_etat_processus,
 		unsigned char *nom, logical1 *existence, logical1 *ouverture,
 		unsigned long *unite);
+logical1 controle(struct_processus *s_etat_processus, unsigned char *fichier,
+		unsigned char *type, unsigned char *somme_candidate);
 logical1 creation_variable(struct_processus *s_etat_processus,
 		struct_variable *s_variable,
 		unsigned char autorisation_creation_variable_statique,
@@ -2675,6 +2711,8 @@ inline ssize_t write_atomic(struct_proce
 */
 
 int alsprintf(unsigned char **strp, const char *fmt, ...);
+int tex_fprintf(struct_processus *s_etat_processus,
+		file *flux, const char *format, ...);
 int transliterated_fprintf(struct_processus *s_etat_processus, file *flux,
 		const char *format, ...);
 int valsprintf(unsigned char **strp, const char *fmt, va_list ap);