X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b42c68d4923a1da7f03b862b05f7e77e655f875..f67e9f5d0e553ae935bd6cad29df46f1565173bf:/src/xbt/xbt_log_layout_format.c diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c index d0d2bf9859..7726483476 100644 --- a/src/xbt/xbt_log_layout_format.c +++ b/src/xbt/xbt_log_layout_format.c @@ -1,6 +1,6 @@ /* layout_simple - a dumb log layout */ -/* Copyright (c) 2007-2017. The SimGrid Team. */ +/* Copyright (c) 2007-2019. The SimGrid Team. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,6 +11,13 @@ #include "xbt/sysdep.h" #include +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif + extern const char *xbt_log_priority_names[8]; #define ERRMSG \ @@ -81,7 +88,6 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co case '\0': fprintf(stderr, "Layout format (%s) ending with %%\n", (char*)l->data); xbt_abort(); - break; case '%': *p = '%'; check_overflow(1);