--- rpl/src/rpl.h	2019/11/11 13:16:25	1.337
+++ rpl/src/rpl.h	2024/01/09 07:33:55	1.351
@@ -1,8 +1,7 @@
-#define DEBUG_MEMOIRE
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.32
-  Copyright (C) 1989-2019 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.35
+  Copyright (C) 1989-2024 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -187,38 +186,40 @@
 #	include "zlib.h"
 
 #	include "openssl/evp.h"
-#	ifndef OPENSSL_NO_MD2
-#		include "openssl/md2.h"
-#	endif
-#	ifndef OPENSSL_NO_MD4
-#		include "openssl/md4.h"
-#	endif
-#	ifndef OPENSSL_NO_MD5
-#		include "openssl/md5.h"
-#	endif
-#	ifndef OPENSSL_NO_MDC2
-#		include "openssl/mdc2.h"
-#	endif
-#	ifndef OPENSSL_NO_RIPEMD
-#		include "openssl/ripemd.h"
-#	endif
-#	ifndef OPENSSL_NO_SHA
-#		include "openssl/sha.h"
-#	endif
-#	ifndef OPENSSL_NO_WHIRLPOOL
-#		include "openssl/whrlpool.h"
-#	endif
-#	ifndef OPENSSL_NO_AES
-#		include "openssl/aes.h"
-#	endif
-#	ifndef OPENSSL_NO_CAMELLIA
-#		include "openssl/camellia.h"
-#	endif
-#	ifndef OPENSSL_NO_RC2
-#		include "openssl/rc2.h"
-#	endif
-#	ifndef OPENSSL_NO_IDEA
-#		include "openssl/idea.h"
+#	ifndef RPLCXX
+#		ifndef OPENSSL_NO_MD2
+#			include "openssl/md2.h"
+#		endif
+#		ifndef OPENSSL_NO_MD4
+#			include "openssl/md4.h"
+#		endif
+#		ifndef OPENSSL_NO_MD5
+#			include "openssl/md5.h"
+#		endif
+#		ifndef OPENSSL_NO_MDC2
+#			include "openssl/mdc2.h"
+#		endif
+#		ifndef OPENSSL_NO_RIPEMD
+#			include "openssl/ripemd.h"
+#		endif
+#		ifndef OPENSSL_NO_SHA
+#			include "openssl/sha.h"
+#		endif
+#		ifndef OPENSSL_NO_WHIRLPOOL
+#			include "openssl/whrlpool.h"
+#		endif
+#		ifndef OPENSSL_NO_AES
+#			include "openssl/aes.h"
+#		endif
+#		ifndef OPENSSL_NO_CAMELLIA
+#			include "openssl/camellia.h"
+#		endif
+#		ifndef OPENSSL_NO_RC2
+#			include "openssl/rc2.h"
+#		endif
+#		ifndef OPENSSL_NO_IDEA
+#			include "openssl/idea.h"
+#		endif
 #	endif
 
 #	include "sqlite3.h"
@@ -270,8 +271,11 @@
 
 #ifndef RPLARGS
 #	ifndef UNIX_PATH_MAX
-		struct sockaddr_un sizecheck;
+#		pragma GCC diagnostic push
+#		pragma GCC diagnostic ignored "-Wunused-variable"
+		static struct sockaddr_un sizecheck;
 #		define UNIX_PATH_MAX sizeof(sizecheck.sun_path)
+#		pragma GCC diagnostic pop
 #	endif
 #endif
 
@@ -732,10 +736,28 @@ void *debug_memoire_modification(void *p
 void debug_memoire_retrait(void *ptr);
 void debug_memoire_verification();
 
-#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)
+#ifdef RPLCXX
+#	define malloc(s) debug_memoire_ajout(s, \
+				const_cast<const unsigned char *> \
+				(reinterpret_cast<unsigned char *> \
+				(const_cast<char *>(__FUNCTION__))), __LINE__, \
+				const_cast<const unsigned char *> \
+				(reinterpret_cast<unsigned char *> \
+				(const_cast<char *>(#s))))
+#	define realloc(s, t) debug_memoire_modification(s, t, \
+				const_cast<const unsigned char *> \
+				(reinterpret_cast<unsigned char *> \
+				(const_cast<char *>(__FUNCTION__))), __LINE__, \
+				const_cast<const unsigned char *> \
+				(reinterpret_cast<unsigned char *> \
+				(const_cast<char *>(#t))))
+#else
+#	define malloc(s) debug_memoire_ajout(s, __FUNCTION__, __LINE__, \
+				(const unsigned char *) #s)
+#	define realloc(s, t) debug_memoire_modification(s, t, \
+				__FUNCTION__, __LINE__, (const unsigned char *) #t)
+#endif
 #define fork() debug_fork(s_etat_processus)
 #endif
 
@@ -1114,7 +1136,8 @@ void debug_memoire_verification();
 #define VIN	__RPL_VIN
 #define VRL	__RPL_VRL
 
-enum t_rplcas_commandes		{ RPLCAS_INTEGRATION = 0, RPLCAS_LIMITE };
+enum t_rplcas_commandes		{ RPLCAS_INTEGRATION = 0, RPLCAS_LIMITE,
+							RPLCAS_SIMPLIFICATION };
 
 enum t_type		{ ADR = 0, ALG, BIN, CHN, CPL, EXT, FCH, FCT, INT, LST,
 				MCX, MIN, MRL, MTX, NOM, NON, PRC, REC, REL, RPN, SCK,
@@ -2651,6 +2674,7 @@ void instruction_clrcntxt(struct_process
 void instruction_clrerr(struct_processus *s_etat_processus);
 void instruction_clrfuse(struct_processus *s_etat_processus);
 void instruction_clrmtx(struct_processus *s_etat_processus);
+void instruction_clrsock(struct_processus *s_etat_processus);
 void instruction_clrsmphr(struct_processus *s_etat_processus);
 void instruction_clrswi(struct_processus *s_etat_processus);
 void instruction_cls(struct_processus *s_etat_processus);