Reduce the visibility of stdio.h because it was loaded wrongly (ie, before _GNU_SOURC...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3351 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 53d8e3d..854edae 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -8,8 +8,8 @@
 #ifndef _SURF_SURFXML_PARSE_H
 #define _SURF_SURFXML_PARSE_H
 
 #ifndef _SURF_SURFXML_PARSE_H
 #define _SURF_SURFXML_PARSE_H
 

+#include <stdio.h> /* to have FILE */

 #include "surf/surfxml.h"
 #include "surf/surfxml.h"

-#include "xbt/sysdep.h" /* to have FILE */

 #include "xbt/function_types.h"
 /* Entry-point of the surfxml parser. */
 extern int_f_void_t *surf_parse;
 #include "xbt/function_types.h"
 /* Entry-point of the surfxml parser. */
 extern int_f_void_t *surf_parse;

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 92c87ff..143a26e 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -21,15 +21,14 @@
    Instead, copy the parts we need (and fake when it's not there) */
 XBT_PUBLIC(int) backtrace (void **__array, int __size);
 
    Instead, copy the parts we need (and fake when it's not there) */
 XBT_PUBLIC(int) backtrace (void **__array, int __size);
 

-/* required ISO-C standard facilities */
-#include <errno.h>
-#include <stdio.h>
-

 
 /*-*-* Emergency debuging: define this when the exceptions get crazy *-*-*/
 #undef __EX_MAYDAY
 
 #ifdef __EX_MAYDAY
 
 /*-*-* Emergency debuging: define this when the exceptions get crazy *-*-*/
 #undef __EX_MAYDAY
 
 #ifdef __EX_MAYDAY

+# include <stdio.h>
+#include <errno.h>
+

 XBT_PUBLIC(int) gras_os_getpid(void);
 #  define MAYDAY_SAVE(m)    printf("%d %s:%d save %p\n",                \
                                    gras_os_getpid(),__FILE__,__LINE__,  \
 XBT_PUBLIC(int) gras_os_getpid(void);
 #  define MAYDAY_SAVE(m)    printf("%d %s:%d save %p\n",                \
                                    gras_os_getpid(),__FILE__,__LINE__,  \

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index a159ff3..a2271ab 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -13,7 +13,6 @@
 
 #include <string.h>
 #include <stdlib.h> 
 
 #include <string.h>
 #include <stdlib.h> 

-#include <stdio.h>

 #include <stdarg.h> /* va_list */
    
 #include "xbt/misc.h"
 #include <stdarg.h> /* va_list */
    
 #include "xbt/misc.h"

diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c
index 1fc6e85..57dd237 100644 (file)
--- a/src/gras/Virtu/sg_emul.c
+++ b/src/gras/Virtu/sg_emul.c
@@ -7,6 +7,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. */
 
 /* 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 <stdio.h> /* sprintf */

 #include "gras/emul.h"
 #include "gras/Virtu/virtu_sg.h"
 #include "gras_modinter.h"
 #include "gras/emul.h"
 #include "gras/Virtu/virtu_sg.h"
 #include "gras_modinter.h"

diff --git a/src/msg/private.h b/src/msg/private.h
index d4b9d6e..ea7e519 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -8,6 +8,7 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 

+#include <stdio.h>

 #include "msg/msg.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
 #include "msg/msg.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 99559a7..a640310 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -9,6 +9,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. */
 
 /* 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 <stdio.h>

 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 84c4586..4422f9d 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -8,6 +8,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <string.h>
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <string.h>

+#include <stdio.h>

 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 02e8edc..29941d5 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -314,6 +314,7 @@ int backtrace (void **__array, int __size) {
 #endif
 
 #ifdef SIMGRID_TEST
 #endif
 
 #ifdef SIMGRID_TEST

+#include <stdio.h>

 #include "xbt/ex.h"
 
 XBT_TEST_SUITE("xbt_ex","Exception Handling");
 #include "xbt/ex.h"
 
 XBT_TEST_SUITE("xbt_ex","Exception Handling");

diff --git a/src/xbt/xbt_matrix.c b/src/xbt/xbt_matrix.c
index 5dfb955..ff2c3c8 100644 (file)
--- a/src/xbt/xbt_matrix.c
+++ b/src/xbt/xbt_matrix.c
@@ -7,6 +7,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. */
 
 /* 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 <stdio.h>

 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/matrix.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/matrix.h"

diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c
index 8b1390f..3c64878 100644 (file)
--- a/tools/gras/stub_generator.c
+++ b/tools/gras/stub_generator.c
@@ -13,6 +13,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#include <stdio.h>

 #include "xbt/sysdep.h"
 #include "xbt/function_types.h"
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 #include "xbt/function_types.h"
 #include "xbt/log.h"

diff --git a/tools/sg_unit_extractor.pl b/tools/sg_unit_extractor.pl
index 0dbb06c..2d36a9e 100755 (executable)
--- a/tools/sg_unit_extractor.pl
+++ b/tools/sg_unit_extractor.pl
@@ -74,6 +74,7 @@ my ($GENERATED)=("/*******************************/\n".
 $beginline+=2;
 open OUT,">$outfile" || die "$progname: Cannot open output file '$outfile': $!\n";
 print OUT $GENERATED;
 $beginline+=2;
 open OUT,">$outfile" || die "$progname: Cannot open output file '$outfile': $!\n";
 print OUT $GENERATED;

+print OUT "#include <stdio.h>\n";

 print OUT "#include \"xbt.h\"\n";
 print OUT $GENERATED;
 print OUT "# $beginline \"$infile\" \n";
 print OUT "#include \"xbt.h\"\n";
 print OUT $GENERATED;
 print OUT "# $beginline \"$infile\" \n";


@@ -85,6 +86,7 @@ close OUT || die "$progname: Cannot close output file '$outfile': $!\n";
 if (! -e "simgrid_units_main.c") {
   open OUT,">simgrid_units_main.c" || die "$progname: Cannot open main file 'simgrid_units_main.c': $!\n";
   print OUT $GENERATED;
 if (! -e "simgrid_units_main.c") {
   open OUT,">simgrid_units_main.c" || die "$progname: Cannot open main file 'simgrid_units_main.c': $!\n";
   print OUT $GENERATED;

+  print OUT "#include <stdio.h>\n\n";

   print OUT "#include \"xbt.h\"\n\n";
   print OUT "extern xbt_test_unit_t _xbt_current_unit;\n\n";
   print OUT "/* SGU: BEGIN PROTOTYPES */\n";
   print OUT "#include \"xbt.h\"\n\n";
   print OUT "extern xbt_test_unit_t _xbt_current_unit;\n\n";
   print OUT "/* SGU: BEGIN PROTOTYPES */\n";