Unverified Commit 323159d8 authored by peastman's avatar peastman Committed by GitHub
Browse files

Merge pull request #2711 from thtrummer/master

Silence warning about casting 'int' to 'void*' on x64 for msvc
parents d36e3414 29ab3d21
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include <errno.h> #include <errno.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#include <process.h> #include <process.h>
#include <stdint.h>
#ifndef ETIMEDOUT #ifndef ETIMEDOUT
#define ETIMEDOUT 110 #define ETIMEDOUT 110
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
#define PTHREAD_DEFAULT_ATTR (PTHREAD_CANCEL_ENABLE) #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_ONCE_INIT 0
#define PTHREAD_MUTEX_INITIALIZER {(void*)-1,-1,0,0,0,0} #define PTHREAD_MUTEX_INITIALIZER {(void*)-1,-1,0,0,0,0}
...@@ -1090,7 +1091,7 @@ static int pthread_barrierattr_destroy(void **attr) ...@@ -1090,7 +1091,7 @@ static int pthread_barrierattr_destroy(void **attr)
static int pthread_barrierattr_setpshared(void **attr, int s) static int pthread_barrierattr_setpshared(void **attr, int s)
{ {
*attr = (void *) s; *attr = (void *)(intptr_t) s;
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment