From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Fri, 27 Sep 2013 14:17:43 +0000 (+0200)
Subject: for one reason or another, Win hates forward declarations of main ..
X-Git-Tag: v3_9_90~71^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/43c727526f21ab6195ed1004116beab29f2abdca

for one reason or another, Win hates forward declarations of main ..
---

diff --git a/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c b/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c
index 4d4c39a233..db9d165315 100644
--- a/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c
+++ b/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c
@@ -11,7 +11,6 @@
 
 static int verbose = 0;
 
-int main(int argc, char *argv[]);
 int parse_args(int argc, char **argv);
 int hindexed_zerotype_test(void);
 int hindexed_sparsetype_test(void);
diff --git a/teshsuite/smpi/mpich3-test/datatype/localpack.c b/teshsuite/smpi/mpich3-test/datatype/localpack.c
index 5348d55f14..11e165a082 100644
--- a/teshsuite/smpi/mpich3-test/datatype/localpack.c
+++ b/teshsuite/smpi/mpich3-test/datatype/localpack.c
@@ -20,7 +20,6 @@ static int verbose = 0;
 
 #define BUF_SIZE 16384
 
-int main(int argc, char *argv[]);
 int parse_args(int argc, char **argv);
 
 int main(int argc, char *argv[])
diff --git a/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c b/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c
index 8f4c004f93..25038fc192 100644
--- a/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c
+++ b/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c
@@ -12,7 +12,6 @@
 static int verbose = 0;
 int a[100][100][100], e[9][9][9];
 
-int main(int argc, char *argv[]);
 
 /* helper functions */
 static int parse_args(int argc, char **argv);
diff --git a/teshsuite/smpi/mpich3-test/datatype/slice-pack.c b/teshsuite/smpi/mpich3-test/datatype/slice-pack.c
index 8fcd3b596d..ef8c3c97a8 100644
--- a/teshsuite/smpi/mpich3-test/datatype/slice-pack.c
+++ b/teshsuite/smpi/mpich3-test/datatype/slice-pack.c
@@ -16,7 +16,6 @@
 static int verbose = 0;
 int a[100][100][100], e[9][9][9];
 
-int main(int argc, char *argv[]);
 
 /* helper functions */
 static int parse_args(int argc, char **argv);
diff --git a/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c b/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c
index 3704293a61..d0c57bd55d 100644
--- a/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c
+++ b/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c
@@ -11,7 +11,6 @@
 
 static int verbose = 0;
 
-int main(int argc, char *argv[]);
 int parse_args(int argc, char **argv);
 int single_struct_test(void);
 
diff --git a/teshsuite/smpi/mpich3-test/datatype/struct-pack.c b/teshsuite/smpi/mpich3-test/datatype/struct-pack.c
index d7b5719a44..cf16e6a279 100644
--- a/teshsuite/smpi/mpich3-test/datatype/struct-pack.c
+++ b/teshsuite/smpi/mpich3-test/datatype/struct-pack.c
@@ -11,7 +11,6 @@
 
 static int verbose = 0;
 
-int main(int argc, char *argv[]);
 int parse_args(int argc, char **argv);
 int single_struct_test(void);
 int array_of_structs_test(void);
diff --git a/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c b/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c
index 1cd22028d5..18e2c59273 100644
--- a/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c
+++ b/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c
@@ -15,7 +15,6 @@
 
 static int verbose = 0;
 
-int main(int argc, char *argv[]);
 int parse_args(int argc, char **argv);
 
 int main(int argc, char *argv[])
diff --git a/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c b/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c
index 0720524d59..dde6eda4ce 100644
--- a/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c
+++ b/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c
@@ -10,8 +10,6 @@
 #include "mpi.h"
 #include "mpitest.h"
 
-int main(int argc, char *argv[]);
-
 /* helper functions */
 int parse_args(int argc, char **argv);
 
diff --git a/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c b/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c
index 5c608f8ee8..d6fd63cf1e 100644
--- a/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c
+++ b/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c
@@ -18,7 +18,6 @@
 */
 static int verbose = 1;
 
-int main(int argc, char *argv[]);
 int parse_args(int argc, char **argv);
 int struct_negdisp_test(void);
 int vector_negstride_test(void);
diff --git a/teshsuite/smpi/mpich3-test/include/mpitestconf.h b/teshsuite/smpi/mpich3-test/include/mpitestconf.h
index eb39223af5..4eb4bb2c7a 100644
--- a/teshsuite/smpi/mpich3-test/include/mpitestconf.h
+++ b/teshsuite/smpi/mpich3-test/include/mpitestconf.h
@@ -57,8 +57,9 @@
 //#define HAVE_FORTRAN_BINDING 0
 
 /* Define to 1 if you have the `getrusage' function. */
+#ifndef WIN32
 #define HAVE_GETRUSAGE 1
-
+#endif
 /* Define if struct hostent contains h_addr_list */
 #define HAVE_H_ADDR_LIST 1
 
@@ -141,8 +142,9 @@
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the <sys/resource.h> header file. */
+#ifndef WIN32
 #define HAVE_SYS_RESOURCE_H 1
-
+#endif
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1