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
xbt_swag: remove duplicated code.
[simgrid.git]
/
src
/
include
/
xbt
/
xbt_os_thread.h
diff --git
a/src/include/xbt/xbt_os_thread.h
b/src/include/xbt/xbt_os_thread.h
index
22d56bb
..
61d4912
100644
(file)
--- a/
src/include/xbt/xbt_os_thread.h
+++ b/
src/include/xbt/xbt_os_thread.h
@@
-10,6
+10,7
@@
#ifndef _XBT_OS_THREAD_H
#define _XBT_OS_THREAD_H
#ifndef _XBT_OS_THREAD_H
#define _XBT_OS_THREAD_H
+#include "gras_config.h"
#include "xbt/misc.h" /* SG_BEGIN_DECL */
#include "xbt/function_types.h"
#include "xbt/misc.h" /* SG_BEGIN_DECL */
#include "xbt/function_types.h"
@@
-26,7
+27,13
@@
SG_BEGIN_DECL()
/** \brief Thread data type (opaque structure) */
typedef struct xbt_os_thread_ *xbt_os_thread_t;
/** \brief Thread data type (opaque structure) */
typedef struct xbt_os_thread_ *xbt_os_thread_t;
-typedef unsigned int xbt_os_thread_key_t;
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+typedef pthread_key_t xbt_os_thread_key_t;
+#elif defined(_XBT_WIN32)
+#include <WinDef.h>
+typedef DWORD xbt_os_thread_key_t;
+#endif
/* Calls pthread_atfork() if present, and else does nothing.
* The only known user of this wrapper is mmalloc_preinit().
/* Calls pthread_atfork() if present, and else does nothing.
* The only known user of this wrapper is mmalloc_preinit().