From 76fc50df9db37b17288ccf8a6c9d5b2254dba6b2 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 1 Jul 2017 23:20:53 +0200 Subject: [PATCH] remove simix.h from two more C files --- src/xbt/xbt_log_layout_format.c | 5 +---- src/xbt/xbt_log_layout_simple.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c index 9ac550d6b2..18c55ac2ce 100644 --- a/src/xbt/xbt_log_layout_format.c +++ b/src/xbt/xbt_log_layout_format.c @@ -6,7 +6,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/host.h" -#include "simgrid/simix.h" /* SIMIX_host_self_get_name */ #include "src/xbt/log_private.h" #include "surf/surf.h" #include "xbt/sysdep.h" @@ -122,9 +121,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co case 'h': /* host name; SimGrid extension */ show_string(sg_host_self_get_name()); break; - case 't': /* thread name; LOG4J compliant */ - show_string(SIMIX_process_self_get_name()); - break; + case 't': /* thread/process name; LOG4J compliant */ case 'P': /* process name; SimGrid extension */ show_string(xbt_procname()); break; diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c index a7f9052bf6..b890b1591d 100644 --- a/src/xbt/xbt_log_layout_simple.c +++ b/src/xbt/xbt_log_layout_simple.c @@ -8,7 +8,7 @@ #include "xbt/sysdep.h" #include "src/xbt/log_private.h" -#include "simgrid/simix.h" /* SIMIX_host_self_get_name */ +#include "simgrid/host.h" /* sg_host_self_get_name */ #include "surf/surf.h" #include -- 2.20.1