--- rpl/src/rplexternals.h 2017/07/03 11:47:05 1.78 +++ rpl/src/rplexternals.h 2017/07/06 10:18:04 1.81 @@ -101,6 +101,15 @@ if (((*s_etat_processus).erreur_execution != d_ex) || \ ((*s_etat_processus).erreur_systeme != d_es)) \ { __VA_ARGS__; return(0); } } while(0) +#define structObject struct_objet +#define initializeObject(a, b) do { \ + (*a).descripteur_bibliotheque = (*b).descripteur_bibliotheque; \ + (*a).extension_type = (*b).extension_type; } while(0) +#define objectContainer(a) (*a).objet +#define ifIsExternal(a, b) if (((*a).type == EXT) && ((*a).extension_type == b)) +#define elseIfIsExternal(a, b) } else if (((*a).type == EXT) && \ + ((*a).extension_type == b)) +#define subType(a) ((*a).extension_type) #define integerFormat(a) formateur_nombre(s_etat_processus, a, 'I') /* @@ -172,8 +181,8 @@ #define declareUnion typedef union { #define as(name) } name; -#define target(a) (*a) -#define address(a) (&a) +#define target(a) (*(a)) +#define address(a) (&(a)) #define subroutine(name) int name() #define beginGroup { __CATCH_SYSTEM_ERROR__; @@ -354,7 +363,8 @@ #define endSubroutine END } #define notice(s, ...) __CATCH_SYSTEM_ERROR__; \ - do { ufprintf(s, __VA_ARGS__); fflush(s); } while(0) + do { if (affichage_rplso == d_vrai) \ + { ufprintf(s, __VA_ARGS__); fflush(s); } } while(0) #define logger(...) __CATCH_SYSTEM_ERROR__; \ do { syslog(LOG_NOTICE, __VA_ARGS__); } while(0) @@ -1056,7 +1066,7 @@ ((*rpl_object).type == CHN) #define ifIsString(rpl_object) if (isString(rpl_object)) -#define elseIfIsString(rpl_object) else if (isString(rpl_object)) +#define elseIfIsString(rpl_object) } else if (isString(rpl_object)) #define setString(rpl_object, string) do { \ struct_processus *s_etat_processus; \