Drop xbt_os_thread_t

[simgrid.git] / 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 d0d2bf9..7726483 100644 (file)
--- 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 <stdio.h>
 
+#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);