--- rpl/src/instructions_t2.c 2010/03/06 18:29:07 1.5 +++ rpl/src/instructions_t2.c 2010/08/17 11:59:28 1.17 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.0.12 + RPL/2 (R) version 4.0.18 Copyright (C) 1989-2010 Dr. BERTRAND Joël This file is part of RPL/2. @@ -20,7 +20,7 @@ */ -#include "rpl.conv.h" +#include "rpl-conv.h" /* @@ -857,6 +857,7 @@ instruction_time(struct_processus *s_eta * Lecture des différents temps */ +# ifndef OS2 if ((getrusage(RUSAGE_SELF, &s_usage_processus_pere)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; @@ -868,6 +869,16 @@ instruction_time(struct_processus *s_eta (*s_etat_processus).erreur_systeme = d_es_processus; return; } +# else + s_usage_processus_pere.ru_utime.tv_sec = 0; + s_usage_processus_pere.ru_utime.tv_usec = 0; + s_usage_processus_pere.ru_stime.tv_sec = 0; + s_usage_processus_pere.ru_stime.tv_usec = 0; + s_usage_processus_fils.ru_utime.tv_sec = 0; + s_usage_processus_fils.ru_utime.tv_usec = 0; + s_usage_processus_fils.ru_stime.tv_sec = 0; + s_usage_processus_fils.ru_stime.tv_usec = 0; +# endif /* * Initialisation de la liste @@ -1819,8 +1830,6 @@ instruction_target(struct_processus *s_e struct_objet *s_objet_argument_1; struct_objet *s_objet_argument_2; - unsigned char *nom; - unsigned long i; unsigned long nombre_elements; @@ -2154,6 +2163,7 @@ instruction_target(struct_processus *s_e else if ((*((struct_socket *) (*s_objet_argument_1).objet)) .domaine == PF_INET6) { // Résolution du nom en IPv6 +# ifdef IPV6 resolution_courante = resolution; while(resolution_courante != NULL) @@ -2201,6 +2211,18 @@ instruction_target(struct_processus *s_e (*resolution_courante).ai_addr)).sin6_addr .s6_addr[i]); } +# else + if ((*s_etat_processus).langue == 'F') + { + printf("+++Attention : Support du protocole" + " IPv6 indisponible\n"); + } + else + { + printf("+++Warning : IPv6 support " + "unavailable\n"); + } +# endif } else {