Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
323159d8
Unverified
Commit
323159d8
authored
Jun 01, 2020
by
peastman
Committed by
GitHub
Jun 01, 2020
Browse files
Merge pull request #2711 from thtrummer/master
Silence warning about casting 'int' to 'void*' on x64 for msvc
parents
d36e3414
29ab3d21
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
libraries/pthreads/include/pthread.h
libraries/pthreads/include/pthread.h
+3
-2
No files found.
libraries/pthreads/include/pthread.h
View file @
323159d8
...
...
@@ -53,6 +53,7 @@
#include <errno.h>
#include <sys/timeb.h>
#include <process.h>
#include <stdint.h>
#ifndef ETIMEDOUT
#define ETIMEDOUT 110
...
...
@@ -78,7 +79,7 @@
#define PTHREAD_DEFAULT_ATTR (PTHREAD_CANCEL_ENABLE)
#define PTHREAD_CANCELED ((void *) 0xDEADBEEF)
#define PTHREAD_CANCELED ((void *)
(uintptr_t)
0xDEADBEEF)
#define PTHREAD_ONCE_INIT 0
#define PTHREAD_MUTEX_INITIALIZER {(void*)-1,-1,0,0,0,0}
...
...
@@ -1090,7 +1091,7 @@ static int pthread_barrierattr_destroy(void **attr)
static
int
pthread_barrierattr_setpshared
(
void
**
attr
,
int
s
)
{
*
attr
=
(
void
*
)
s
;
*
attr
=
(
void
*
)
(
intptr_t
)
s
;
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment