From: navarrop Date: Mon, 22 Nov 2010 14:19:52 +0000 (+0000) Subject: Fix full flag mode with Mac. X-Git-Tag: v3_5~235 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/715060b191e4ff4b070c59ea7e5c643c7365791a Fix full flag mode with Mac. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8595 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/java/jmsg.c b/src/java/jmsg.c index 341473e3de..43dc519e28 100644 --- a/src/java/jmsg.c +++ b/src/java/jmsg.c @@ -251,7 +251,7 @@ Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls, m_process_t process = MSG_process_from_PID(PID); if (!process) { - jxbt_throw_process_not_found(env, bprintf("PID = %d", PID)); + jxbt_throw_process_not_found(env, bprintf("PID = %d",(int) PID)); return NULL; } diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 49c29de457..2483f302f4 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -176,7 +176,7 @@ struct s_routing_global { xbt_dict_t where_network_elements; /* char* -> network_element_info_t */ void *loopback; size_t size_of_link; - const xbt_dynar_t(*get_route) (const char *src, const char *dst); + xbt_dynar_t(*get_route) (const char *src, const char *dst); xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst); xbt_dynar_t(*get_onelink_routes) (void); e_surf_network_element_type_t(*get_network_element_type) (const char diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 12b7ff2e81..60654f91ce 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -731,7 +731,7 @@ static route_extended_t _get_route(const char *src, const char *dst) * by calling the differents "get_route" functions in each routing component. * No need to free the returned dynar. It will be freed at the next call. */ -static const xbt_dynar_t get_route(const char *src, const char *dst) +static xbt_dynar_t get_route(const char *src, const char *dst) { route_extended_t e_route;