A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
smpi
/
smpif.h.in
diff --git
a/include/smpi/smpif.h.in
b/include/smpi/smpif.h.in
index
3e8ddf7
..
a61dabc
100644
(file)
--- a/
include/smpi/smpif.h.in
+++ b/
include/smpi/smpif.h.in
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-7,19
+7,21
@@
#ifndef SMPIF_H
#define SMPIF_H
#ifndef SMPIF_H
#define SMPIF_H
-#cmakedefine
HAVE_F2C_H @HAVE_SMPI_F2C_H
@
+#cmakedefine
SMPI_F2C @SMPI_F2C
@
-#ifndef HAVE_F2C_H
-#error F2C is mandatory
-#endif
+#ifdef SMPI_F2C
#include <xbt/misc.h>
#include <smpi/smpi.h>
#include <xbt/misc.h>
#include <smpi/smpi.h>
+/* those are defined in f2c.h */
+#undef min
+#undef max
#include <f2c.h>
#include <f2c.h>
+XBT_PUBLIC_DATA(__thread int) smpi_current_rank;
+
XBT_PUBLIC(int) smpi_process_argc(void);
XBT_PUBLIC(int) smpi_process_getarg(integer* index, char* dst, ftnlen len);
XBT_PUBLIC(int) smpi_process_argc(void);
XBT_PUBLIC(int) smpi_process_getarg(integer* index, char* dst, ftnlen len);
-XBT_PUBLIC(int) smpi_global_size(void);
#define smpi_sample_local__(pi,pt) \
{ \
#define smpi_sample_local__(pi,pt) \
{ \
@@
-43,3
+45,5
@@
XBT_PUBLIC(int) smpi_global_size(void);
#endif
#endif
+
+#endif // SMPI_F2C