--- rpl/src/analyse.c	2010/07/31 10:34:17	1.24
+++ rpl/src/analyse.c	2011/01/03 12:08:02	1.35
@@ -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.20
+  Copyright (C) 1989-2011 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -20,7 +20,7 @@
 */
 
 
-#include "rpl.conv.h"
+#include "rpl-conv.h"
 
 
 /*
@@ -459,7 +459,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("INCR", instruction_incr);
 	//INSTRUCTION("ISOL");
 	INSTRUCTION("ISWI", instruction_iswi);
+#	ifndef OS2
 	INSTRUCTION("KILL", instruction_kill);
+#	endif
 	INSTRUCTION("KIND", instruction_kind);
 	INSTRUCTION("LAST", instruction_last);
 	INSTRUCTION("LEGV", instruction_legv);
@@ -486,7 +488,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("PLOT", instruction_plot);
 	INSTRUCTION("PMAX", instruction_pmax);
 	INSTRUCTION("PMIN", instruction_pmin);
+#	ifndef OS2
 	INSTRUCTION("POKE", instruction_poke);
+#	endif
 	INSTRUCTION("PPAR", instruction_ppar);
 	INSTRUCTION("PRMD", instruction_prmd);
 	INSTRUCTION("PRST", instruction_prst);
@@ -552,7 +556,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("STO-", instruction_sto_moins);
 	INSTRUCTION("STO/", instruction_sto_division);
 	INSTRUCTION("STOF", instruction_stof);
+#	ifndef OS2
 	INSTRUCTION("STOP", instruction_stop);
+#	endif
 	INSTRUCTION("STOS", instruction_stos);
 	INSTRUCTION("STWS", instruction_stws);
 	INSTRUCTION("SWAP", instruction_swap);
@@ -685,7 +691,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("SLICE", instruction_slice);
 	//INSTRUCTION("SLIST")
 	//Instruction HP48 (somme des termes d'une liste)
+#	ifndef OS2
 	INSTRUCTION("SPAWN", instruction_spawn);
+#	endif
 	INSTRUCTION("START", instruction_start);
 	INSTRUCTION("STORE", instruction_store);
 	INSTRUCTION("STR->", instruction_str_fleche);
@@ -722,7 +730,9 @@ initialisation_instructions(struct_proce
 	INSTRUCTION("CLRSWI", instruction_clrswi);
 	INSTRUCTION("CREATE", instruction_create);
 	INSTRUCTION("DELETE", instruction_delete);
+#	ifndef OS2
 	INSTRUCTION("DETACH", instruction_detach);
+#	endif
 	INSTRUCTION("DIAG->", instruction_diag_fleche);
 	//INSTRUCTION("DOLIST")
 	//Instruction HP48 (application d'une fonction à une liste)
@@ -816,7 +826,9 @@ initialisation_instructions(struct_proce
 
 	INSTRUCTION("CLRCNTXT", instruction_clrcntxt);
 	INSTRUCTION("CLRSMPHR", instruction_clrsmphr);
+#	ifndef OS2
 	INSTRUCTION("CONTINUE", instruction_continue);
+#	endif
 	INSTRUCTION("DUPCNTXT", instruction_dupcntxt);
 	INSTRUCTION("FUNCTION", instruction_function);
 	INSTRUCTION("IMPLICIT", instruction_implicit);
@@ -884,7 +896,7 @@ initialisation_instructions(struct_proce
 }
 
 
-extern inline void *
+void *
 analyse_instruction(struct_processus *s_etat_processus, unsigned char *ptr)
 {
 	int								pointeur;
@@ -957,6 +969,11 @@ analyse(struct_processus *s_etat_process
 
 	void							(*instruction)();
 
+#	ifdef DMALLOC
+	BUG(dmalloc_verify(NULL) == DMALLOC_VERIFY_ERROR,
+			printf("HEAP CORRUPTION!"));
+#	endif
+
 	errno = 0;
 	(*s_etat_processus).var_volatile_exception_gsl = 0;
 
@@ -1144,6 +1161,7 @@ analyse(struct_processus *s_etat_process
 --------------------------------------------------------------------------------
 */
 
+#	ifndef OS2
 	if ((*s_etat_processus).pourcentage_maximal_cpu < 100)
 	{
 		getrusage(RUSAGE_SELF, &usage_final);
@@ -1199,6 +1217,7 @@ analyse(struct_processus *s_etat_process
 			usage_initial = usage_final;
 		}
 	}
+#	endif
 
 /*
 --------------------------------------------------------------------------------