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
Do not put the extern keyword several times (XBT_PUBLIC adds a new one)
[simgrid.git]
/
src
/
xbt
/
context_private.h
diff --git
a/src/xbt/context_private.h
b/src/xbt/context_private.h
index 9e1d69dfe6665e78269b9f3dc9f8ce3e9b1c465f..25133cf9dcf6fd560ac307a9f83c2ec1e66c57c6 100644
(file)
--- a/
src/xbt/context_private.h
+++ b/
src/xbt/context_private.h
@@
-13,25
+13,18
@@
#include "xbt/swag.h"
#include "xbt/dynar.h" /* void_f_pvoid_t */
#include "portable.h" /* loads context system definitions */
#include "xbt/swag.h"
#include "xbt/dynar.h" /* void_f_pvoid_t */
#include "portable.h" /* loads context system definitions */
+
+#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) && !defined(__TOS_WIN__)
#include "ucontext_stack.h" /* loads context system definitions */
#include "ucontext_stack.h" /* loads context system definitions */
+#endif
#include "xbt/context.h"
#include "xbt/context.h"
-
-#ifdef S_SPLINT_S
-/* Dummy definition for splint since it chokes on ucontext.h */
-typedef struct ucontext {
- struct ucontext *uc_link;
- sigset_t uc_sigmask;
- int uc_stack;
- int uc_mcontext;
-} ucontext_t;
-typedef int CONTEXT;
-#endif
+#include "xbt/ex.h"
#ifdef USE_PTHREADS
# include <pthread.h>
#else
#ifdef USE_PTHREADS
# include <pthread.h>
#else
-# define STACK_SIZE
524288
+# define STACK_SIZE
128*1024 /* Lower this if you want to reduce the memory consumption */
#endif /* USE_PTHREADS */
typedef struct s_xbt_context {
#endif /* USE_PTHREADS */
typedef struct s_xbt_context {
@@
-52,6
+45,7
@@
typedef struct s_xbt_context {
void *startup_arg;
void_f_pvoid_t *cleanup_func;
void *cleanup_arg;
void *startup_arg;
void_f_pvoid_t *cleanup_func;
void *cleanup_arg;
+ ex_ctx_t *exception; /* exception */
} s_xbt_context_t;
#else
} s_xbt_context_t;
#else