From 206f5fd3ccc5de9c9e90ec5d8933cab8fd3bf070 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 6 Sep 2004 15:09:31 +0000 Subject: [PATCH 1/1] fix the inclusion paths git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@398 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/Makefile.am | 111 ++++++++++++++++++++++++- src/gras/DataDesc/cbps.c | 2 +- src/gras/DataDesc/datadesc.c | 2 +- src/gras/DataDesc/datadesc_private.h | 2 +- src/gras/DataDesc/ddt_convert.c | 2 +- src/gras/DataDesc/ddt_create.c | 2 +- src/gras/DataDesc/ddt_exchange.c | 4 +- src/gras/DataDesc/ddt_parse.c | 4 +- src/gras/DataDesc/ddt_parse.yy.c | 72 ++++++++-------- src/gras/DataDesc/ddt_parse.yy.l | 4 +- src/gras/Msg/msg.c | 8 +- src/gras/Msg/msg_private.h | 2 +- src/gras/Transport/rl_transport.c | 2 +- src/gras/Transport/transport.c | 2 +- src/gras/Transport/transport_private.h | 4 +- src/gras/Virtu/process.c | 4 +- src/gras/Virtu/rl_conditional.c | 2 +- src/gras/Virtu/rl_process.c | 2 +- src/gras/Virtu/virtu_rl.h | 2 +- src/xbt/log.c | 10 +-- 20 files changed, 173 insertions(+), 70 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index cf00e4689a..ebcec5575f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,2 +1,109 @@ -SUBDIRS=include base examples -# modules (before examples) +SUBDIRS=. +# amok not ported to GRAS NG yet +AM_CFLAGS= -DNDEBUG + +# -DNLOG cuts absolutely all logs at compilation time. +# -DNDEBUG cuts asserts and logs at "trace" and "debug" levels. + +# -g -ffast-math -funroll-loops -O3 -fno-strict-aliasing +# Those should be added by configure when using gcc +# fast-math is nasty when using IEEE floating point semantic +# strict-aliasing breaks my type-punning bad habit. + + +MAINTAINERCLEANFILES=Makefile.in +INCLUDES= -I$(top_srcdir)/src/include \ + @CFLAGS_SimGrid@ +EXTRA_DIST= \ + gros/dict_private.h \ + \ + gras/gras_private.h \ + gras/Transport/transport_interface.h \ + gras/Virtu/virtu_interface.h \ + gras/Virtu/virtu_rl.h \ + gras/Virtu/virtu_sg.h \ + gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c + +#LIBRARY_VERSION= 0:0:0 +# | | | +# +------+ | +---+ +# | | | +# current:revision:age +# | | | +# | | +- Increment if interfaces have been added +# | | Set to zero if interfaces have been removed or +# | | changed +# | +- Increment if source code has changed +# | Set to zero if current is incremented +# +- Increment if interfaces have been added, removed or changed + +VERSION_INFO= -release 20040722 -version-info 0:0:0 +# from `info libtool "Updating version info"` +# and `info libtool "Release numbers"` +# +# A) For stable library (interface wise), you should use --version-info: +# +# - Begin with C:R:A = 0:0:0 (ie here, VERSION_INFO= -version-info 0:0:0) +# - Do not update it before public release (keep numbers small) +# +# ----------------------------------------------------------------------+ +# + Interface | code of existing | Interface | New version info | +# | removal/change? | interface changed? | addition? | | +# +-----------------+--------------------+-----------+------------------+ +# | yes | must be yes ;) | | C++ : 0 : 0 | +# | no | yes | yes | C : R++ : A++ | +# | no | yes | no | C : R++ : A | +# | no | no | yes | C : R : A++ | +# | no | no | no | C : R : A | +# +-----------------+--------------------+-----------+------------------+ +# +# B) For rapidely changing library, you should go for the -release flag +# +# It modifies the library name, and you thus cannot say that a library +# using this trick is ready for a "stable" release (say, in Debian). + +if HAVE_SG + lib_LTLIBRARIES= libgrasrl.la libgrassg.la +else + lib_LTLIBRARIES= libgrasrl.la +endif + +# gros/config.c + +COMMON_S=\ + \ + gros/module.c gros/core_interface.h \ + gros/log.c gros/log_default_appender.c gros/error.c \ + gros/dynar.c \ + gros/dict.c gros/dict_elm.c gros/dict_cursor.c \ + gros/set.c \ + \ + \ + gras/Transport/transport.c gras/Transport/transport_private.h gras/Transport/transport_plugin_buf.c \ + \ + gras/DataDesc/ddt_create.c \ + gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \ + gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \ + gras/DataDesc/datadesc_interface.h gras/DataDesc/datadesc_private.h \ + gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \ + \ + gras/Msg/msg.c gras/Msg/msg_interface.h gras/Msg/msg_private.h \ + \ + gras/Virtu/process.c + +gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l + @LEX@ -o$@ -Pgras_ddt_parse_ $^ + +libgrasrl_la_SOURCES= $(COMMON_S) \ + gras/Transport/rl_transport.c gras/Transport/transport_plugin_tcp.c gras/Transport/transport_plugin_file.c \ + \ + gras/Virtu/rl_process.c gras/Virtu/rl_time.c gras/Virtu/rl_conditional.c +libgrasrl_la_LDFLAGS = $(VERSION_INFO) + +if HAVE_SG + libgrassg_la_SOURCES= $(COMMON_S) \ + gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ + \ + gras/Virtu/sg_process.c gras/Virtu/sg_time.c gras/Virtu/sg_conditional.c + libgrassg_la_LDFLAGS = $(VERSION_INFO) +endif diff --git a/src/gras/DataDesc/cbps.c b/src/gras/DataDesc/cbps.c index 37e9b278be..19562ec7a6 100644 --- a/src/gras/DataDesc/cbps.c +++ b/src/gras/DataDesc/cbps.c @@ -8,7 +8,7 @@ /* 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. */ -#include "DataDesc/datadesc_private.h" +#include "gras/DataDesc/datadesc_private.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(cbps,datadesc); typedef struct { diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c index 46739e460b..889fc98be4 100644 --- a/src/gras/DataDesc/datadesc.c +++ b/src/gras/DataDesc/datadesc.c @@ -8,7 +8,7 @@ /* 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. */ -#include "DataDesc/datadesc_private.h" +#include "gras/DataDesc/datadesc_private.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(datadesc,GRAS); /* FIXME: make this host-dependent using a trick such as UserData*/ diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h index e3f3f8d325..f21bcc238c 100644 --- a/src/gras/DataDesc/datadesc_private.h +++ b/src/gras/DataDesc/datadesc_private.h @@ -14,7 +14,7 @@ #define GRAS_DATADESC_PRIVATE_H #include "gras_private.h" -#include "DataDesc/datadesc_interface.h" +#include "gras/DataDesc/datadesc_interface.h" /** * aligned: diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c index 86fa5111e2..22cf1696e3 100644 --- a/src/gras/DataDesc/ddt_convert.c +++ b/src/gras/DataDesc/ddt_convert.c @@ -12,7 +12,7 @@ /* C combines the power of assembler with the portability of assembler. */ /************************************************************************/ -#include "DataDesc/datadesc_private.h" +#include "gras/DataDesc/datadesc_private.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(convert,datadesc); diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c index 87aa2a24b8..a122879ca5 100644 --- a/src/gras/DataDesc/ddt_create.c +++ b/src/gras/DataDesc/ddt_create.c @@ -8,7 +8,7 @@ /* 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. */ -#include "DataDesc/datadesc_private.h" +#include "gras/DataDesc/datadesc_private.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_create,datadesc); diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c index fb5b7b4bdd..d554ed15f8 100644 --- a/src/gras/DataDesc/ddt_exchange.c +++ b/src/gras/DataDesc/ddt_exchange.c @@ -8,8 +8,8 @@ /* 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. */ -#include "DataDesc/datadesc_private.h" -#include "Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ +#include "gras/DataDesc/datadesc_private.h" +#include "gras/Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(exchange,datadesc); diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c index b206811b30..1fd158f305 100644 --- a/src/gras/DataDesc/ddt_parse.c +++ b/src/gras/DataDesc/ddt_parse.c @@ -10,8 +10,8 @@ #include /* isdigit */ -#include "DataDesc/datadesc_private.h" -#include "DataDesc/ddt_parse.yy.h" +#include "gras/DataDesc/datadesc_private.h" +#include "gras/DataDesc/ddt_parse.yy.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_parse,datadesc); diff --git a/src/gras/DataDesc/ddt_parse.yy.c b/src/gras/DataDesc/ddt_parse.yy.c index d1318d0d8c..b0775f779a 100644 --- a/src/gras/DataDesc/ddt_parse.yy.c +++ b/src/gras/DataDesc/ddt_parse.yy.c @@ -15,7 +15,7 @@ #define yyrestart gras_ddt_parse_restart #define yytext gras_ddt_parse_text -#line 19 "DataDesc/ddt_parse.yy.c" +#line 19 "gras/DataDesc/ddt_parse.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -421,7 +421,7 @@ static char *yy_last_accepting_cpos; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "DataDesc/ddt_parse.yy.l" +#line 1 "gras/DataDesc/ddt_parse.yy.l" #define INITIAL 0 /* $Id$ */ /* DataDesc/ddt_parse -- automatic parsing of data structures */ @@ -429,9 +429,9 @@ char *yytext; /* Copyright (C) 2003, 2004 Martin Quinson. */ /* 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. */ -#line 13 "DataDesc/ddt_parse.yy.l" -#include"DataDesc/datadesc_private.h" -#include"DataDesc/ddt_parse.yy.h" +#line 13 "gras/DataDesc/ddt_parse.yy.l" +#include "gras/DataDesc/datadesc_private.h" +#include "gras/DataDesc/ddt_parse.yy.h" #include YY_BUFFER_STATE input_buffer; FILE *file_to_parse; @@ -447,7 +447,7 @@ char *yytext; #define comment 2 #define foo 3 -#line 451 "DataDesc/ddt_parse.yy.c" +#line 451 "gras/DataDesc/ddt_parse.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -609,7 +609,7 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 33 "DataDesc/ddt_parse.yy.l" +#line 33 "gras/DataDesc/ddt_parse.yy.l" int comment_caller=0; int annotate_caller=0; @@ -617,7 +617,7 @@ YY_DECL char string_buf[GRAS_DDT_PARSE_MAX_STR_CONST]; char *string_buf_ptr = NULL; -#line 621 "DataDesc/ddt_parse.yy.c" +#line 621 "gras/DataDesc/ddt_parse.yy.c" if ( yy_init ) { @@ -702,12 +702,12 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 40 "DataDesc/ddt_parse.yy.l" +#line 40 "gras/DataDesc/ddt_parse.yy.l" YY_BREAK case 2: YY_RULE_SETUP -#line 42 "DataDesc/ddt_parse.yy.l" +#line 42 "gras/DataDesc/ddt_parse.yy.l" { /****************** ANNOTATION ************************/ DEBUG0("Begin annotation"); annotate_caller = INITIAL; @@ -718,7 +718,7 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 49 "DataDesc/ddt_parse.yy.l" +#line 49 "gras/DataDesc/ddt_parse.yy.l" { /* trim annotation */ DEBUG0("Begin annotation"); annotate_caller = foo; @@ -729,7 +729,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 57 "DataDesc/ddt_parse.yy.l" +#line 57 "gras/DataDesc/ddt_parse.yy.l" { DEBUG0("End annotation"); gras_ddt_parse_char_pos+= strlen(yytext); @@ -739,21 +739,21 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 64 "DataDesc/ddt_parse.yy.l" +#line 64 "gras/DataDesc/ddt_parse.yy.l" { PARSE_ERROR0("``/*g'' construct closed by a regular ``*/''"); } YY_BREAK case 6: YY_RULE_SETUP -#line 67 "DataDesc/ddt_parse.yy.l" +#line 67 "gras/DataDesc/ddt_parse.yy.l" { PARSE_ERROR0("Type annotation cannot spread over several lines"); } YY_BREAK case 7: YY_RULE_SETUP -#line 71 "DataDesc/ddt_parse.yy.l" +#line 71 "gras/DataDesc/ddt_parse.yy.l" { /* eat the rest */ gras_ddt_parse_char_pos+= strlen(yytext); gras_ddt_parse_col_pos+= strlen(yytext); @@ -762,7 +762,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 77 "DataDesc/ddt_parse.yy.l" +#line 77 "gras/DataDesc/ddt_parse.yy.l" { /****************** COMMENTS ************************/ // constructs like /*g [string] g*/ are not comments but size annotations comment_caller = INITIAL; @@ -771,7 +771,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 83 "DataDesc/ddt_parse.yy.l" +#line 83 "gras/DataDesc/ddt_parse.yy.l" { comment_caller = foo; BEGIN(comment); @@ -779,19 +779,19 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP -#line 88 "DataDesc/ddt_parse.yy.l" +#line 88 "gras/DataDesc/ddt_parse.yy.l" { /* eat anything that's not a '*' */ } YY_BREAK case 11: YY_RULE_SETUP -#line 90 "DataDesc/ddt_parse.yy.l" +#line 90 "gras/DataDesc/ddt_parse.yy.l" { /* eat up '*'s not followed by '/'s */ } YY_BREAK case 12: YY_RULE_SETUP -#line 92 "DataDesc/ddt_parse.yy.l" +#line 92 "gras/DataDesc/ddt_parse.yy.l" { ++gras_ddt_parse_line_pos; gras_ddt_parse_col_pos=0; @@ -800,7 +800,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 97 "DataDesc/ddt_parse.yy.l" +#line 97 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos+= strlen(yytext); gras_ddt_parse_col_pos+= strlen(yytext); @@ -809,7 +809,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 103 "DataDesc/ddt_parse.yy.l" +#line 103 "gras/DataDesc/ddt_parse.yy.l" { /****************** STATEMENTS ************************/ gras_ddt_parse_char_pos += strlen(yytext); gras_ddt_parse_col_pos += strlen(yytext); @@ -819,7 +819,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 109 "DataDesc/ddt_parse.yy.l" +#line 109 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -829,7 +829,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 115 "DataDesc/ddt_parse.yy.l" +#line 115 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -839,7 +839,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 121 "DataDesc/ddt_parse.yy.l" +#line 121 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -849,7 +849,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 127 "DataDesc/ddt_parse.yy.l" +#line 127 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -859,7 +859,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 133 "DataDesc/ddt_parse.yy.l" +#line 133 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -869,7 +869,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 139 "DataDesc/ddt_parse.yy.l" +#line 139 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -879,7 +879,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 145 "DataDesc/ddt_parse.yy.l" +#line 145 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -889,7 +889,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 151 "DataDesc/ddt_parse.yy.l" +#line 151 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -899,7 +899,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 157 "DataDesc/ddt_parse.yy.l" +#line 157 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -909,7 +909,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 163 "DataDesc/ddt_parse.yy.l" +#line 163 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_line_pos++; gras_ddt_parse_char_pos++; @@ -919,7 +919,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 169 "DataDesc/ddt_parse.yy.l" +#line 169 "gras/DataDesc/ddt_parse.yy.l" { gras_ddt_parse_char_pos++; gras_ddt_parse_col_pos++; @@ -928,10 +928,10 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 174 "DataDesc/ddt_parse.yy.l" +#line 174 "gras/DataDesc/ddt_parse.yy.l" ECHO; YY_BREAK -#line 935 "DataDesc/ddt_parse.yy.c" +#line 935 "gras/DataDesc/ddt_parse.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(annotate): case YY_STATE_EOF(comment): @@ -1824,7 +1824,7 @@ int main() return 0; } #endif -#line 174 "DataDesc/ddt_parse.yy.l" +#line 174 "gras/DataDesc/ddt_parse.yy.l" /* {space}+ { return(TOKEN_SPACE);} */ diff --git a/src/gras/DataDesc/ddt_parse.yy.l b/src/gras/DataDesc/ddt_parse.yy.l index fcb76a973d..007303b197 100644 --- a/src/gras/DataDesc/ddt_parse.yy.l +++ b/src/gras/DataDesc/ddt_parse.yy.l @@ -10,8 +10,8 @@ %option noyywrap %{ -#include"DataDesc/datadesc_private.h" -#include"DataDesc/ddt_parse.yy.h" +#include "gras/DataDesc/datadesc_private.h" +#include "gras/DataDesc/ddt_parse.yy.h" #include YY_BUFFER_STATE input_buffer; FILE *file_to_parse; diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c index 23ceb57b3c..d2c731e7ba 100644 --- a/src/gras/Msg/msg.c +++ b/src/gras/Msg/msg.c @@ -8,10 +8,10 @@ /* 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. */ -#include "Msg/msg_private.h" -#include "DataDesc/datadesc_interface.h" -#include "Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ -#include "Virtu/virtu_interface.h" +#include "gras/Msg/msg_private.h" +#include "gras/DataDesc/datadesc_interface.h" +#include "gras/Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ +#include "gras/Virtu/virtu_interface.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(msg,GRAS); diff --git a/src/gras/Msg/msg_private.h b/src/gras/Msg/msg_private.h index 1596424d59..6d71574bfb 100644 --- a/src/gras/Msg/msg_private.h +++ b/src/gras/Msg/msg_private.h @@ -14,7 +14,7 @@ #define GRAS_MESSAGE_PRIVATE_H #include "gras_private.h" -#include "Msg/msg_interface.h" +#include "gras/Msg/msg_interface.h" /** * gras_msgtype_t: diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c index 1dfa236d50..25a0ba9f9d 100644 --- a/src/gras/Transport/rl_transport.c +++ b/src/gras/Transport/rl_transport.c @@ -12,7 +12,7 @@ #include #include -#include "Transport/transport_private.h" +#include "gras/Transport/transport_private.h" GRAS_LOG_EXTERNAL_CATEGORY(transport); GRAS_LOG_DEFAULT_CATEGORY(transport); diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index cb207eb5da..1e369c07d4 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -10,7 +10,7 @@ #include /* time() */ -#include "Transport/transport_private.h" +#include "gras/Transport/transport_private.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,GRAS); diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h index 25de5ce3eb..3f22f44d98 100644 --- a/src/gras/Transport/transport_private.h +++ b/src/gras/Transport/transport_private.h @@ -14,8 +14,8 @@ #define GRAS_TRP_PRIVATE_H #include "gras_private.h" -#include "Transport/transport_interface.h" -#include "Virtu/virtu_interface.h" /* socketset_get() */ +#include "gras/Transport/transport_interface.h" +#include "gras/Virtu/virtu_interface.h" /* socketset_get() */ /** * s_gras_socket: diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c index bb79ab530a..7922d2800f 100644 --- a/src/gras/Virtu/process.c +++ b/src/gras/Virtu/process.c @@ -9,8 +9,8 @@ under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras_private.h" -#include "Virtu/virtu_interface.h" -#include "Msg/msg_interface.h" /* FIXME: Get rid of this cyclic */ +#include "gras/Virtu/virtu_interface.h" +#include "gras/Msg/msg_interface.h" /* FIXME: Get rid of this cyclic */ /* ************************************************************************** * Process data diff --git a/src/gras/Virtu/rl_conditional.c b/src/gras/Virtu/rl_conditional.c index c364faf8f5..c704f0f172 100644 --- a/src/gras/Virtu/rl_conditional.c +++ b/src/gras/Virtu/rl_conditional.c @@ -8,7 +8,7 @@ /* 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. */ -#include "Virtu/virtu_rl.h" +#include "gras/Virtu/virtu_rl.h" int gras_if_RL(void) { return 1; diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c index d53d778ae2..c49e663080 100644 --- a/src/gras/Virtu/rl_process.c +++ b/src/gras/Virtu/rl_process.c @@ -8,7 +8,7 @@ /* 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. */ -#include "Virtu/virtu_rl.h" +#include "gras/Virtu/virtu_rl.h" GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(process,GRAS); diff --git a/src/gras/Virtu/virtu_rl.h b/src/gras/Virtu/virtu_rl.h index ac1b7fbd9a..648e7c25d4 100644 --- a/src/gras/Virtu/virtu_rl.h +++ b/src/gras/Virtu/virtu_rl.h @@ -12,6 +12,6 @@ #define VIRTU_RL_H #include "gras_private.h" -#include "Virtu/virtu_interface.h" +#include "gras/Virtu/virtu_interface.h" #endif /* VIRTU_RL_H */ diff --git a/src/xbt/log.c b/src/xbt/log.c index 48bb91114d..fb86a02f25 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -9,16 +9,12 @@ under the terms of the license (GNU LGPL) which comes with this package. */ -#include "Core/core_interface.h" +#include "gros_interface.h" #include "gras_private.h" #include #include #include -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - typedef struct { char *catname; gras_log_priority_t thresh; @@ -206,7 +202,7 @@ static gras_error_t _gras_log_parse_setting(const char* control_string, gras_assert1(*dot == '.' && *eq == '=', "Invalid control string '%s'",control_string); - if (!strncmp(dot + 1, "thresh", MIN(eq - dot - 1,strlen("thresh")))) { + if (!strncmp(dot + 1, "thresh", min(eq - dot - 1,strlen("thresh")))) { int i; char *neweq=strdup(eq+1); char *p=neweq-1; @@ -232,7 +228,7 @@ static gras_error_t _gras_log_parse_setting(const char* control_string, free(neweq); } else { char buff[512]; - snprintf(buff,MIN(512,eq - dot - 1),"%s",dot+1); + snprintf(buff,min(512,eq - dot - 1),"%s",dot+1); gras_assert1(FALSE,"Unknown setting of the log category: %s",buff); } if (!(set->catname=malloc(dot - name+1))) -- 2.20.1