--- rpl/src/instructions_m5.c 2010/05/09 15:43:15 1.1 +++ rpl/src/instructions_m5.c 2017/01/18 15:44:21 1.51 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.15 - Copyright (C) 1989-2010 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.26 + Copyright (C) 1989-2017 Dr. BERTRAND Joël This file is part of RPL/2. @@ -20,7 +20,7 @@ */ -#include "rpl.conv.h" +#include "rpl-conv.h" /* @@ -71,16 +71,13 @@ instruction_memlock(struct_processus *s_ } } - if (_POSIX_MEMLOCK > 0) - { +# if _POSIX_MEMLOCK > 0 if (mlockall(MCL_CURRENT | MCL_FUTURE) != 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; return; } - } - else - { +# else if ((*s_etat_processus).langue == 'F') { printf("+++Attention : Verrouillage en mémoire du processus " @@ -92,7 +89,7 @@ instruction_memlock(struct_processus *s_ } fflush(stdout); - } +# endif return; } @@ -117,7 +114,7 @@ instruction_memunlock(struct_processus * if ((*s_etat_processus).affichage_arguments == 'Y') { - printf("\n MEMLOCK "); + printf("\n MEMUNLOCK "); if ((*s_etat_processus).langue == 'F') { @@ -146,16 +143,13 @@ instruction_memunlock(struct_processus * } } - if (_POSIX_MEMLOCK > 0) - { +# if _POSIX_MEMLOCK > 0 if (munlockall() != 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; return; } - } - else - { +# else if ((*s_etat_processus).langue == 'F') { printf("+++Attention : Verrouillage en mémoire du processus " @@ -167,7 +161,7 @@ instruction_memunlock(struct_processus * } fflush(stdout); - } +# endif return; }