OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

AddressSanitizer: Don't include GrandCentralDispatch headers in asan headers on Mac 

llvm-svn: 151044
This commit is contained in:
Alexey Samsonov 2012-02-21 08:30:57 +00:00
parent 028a6721c9
commit 789456bf68
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler-rt/lib/asan/asan_mac.h
View File

@ -18,8 +18,6 @@
#include "asan_interceptors.h" #include "asan_interceptors.h"
// TODO(glider): need to check if the OS X version is 10.6 or greater.
#include <dispatch/dispatch.h>
#include <setjmp.h> #include <setjmp.h>
#include <CoreFoundation/CFString.h> #include <CoreFoundation/CFString.h>
@ -37,6 +35,9 @@ int GetMacosVersion();
typedef void* pthread_workqueue_t; typedef void* pthread_workqueue_t;
typedef void* pthread_workitem_handle_t; typedef void* pthread_workitem_handle_t;
typedef void* dispatch_group_t;
typedef void* dispatch_queue_t;
typedef uint64_t dispatch_time_t;
typedef void (*dispatch_function_t)(void *block); typedef void (*dispatch_function_t)(void *block);
typedef void* (*worker_t)(void *block); typedef void* (*worker_t)(void *block);
@ -78,10 +79,16 @@ typedef struct {
extern "C" { extern "C" {
// dispatch_barrier_async_f() is not declared in <dispatch/dispatch.h>. void dispatch_async_f(dispatch_queue_t dq, void *ctxt,
void dispatch_barrier_async_f(dispatch_queue_t dq, dispatch_function_t func);
void *ctxt, dispatch_function_t func); void dispatch_sync_f(dispatch_queue_t dq, void *ctxt,
// Neither is pthread_workqueue_additem_np(). dispatch_function_t func);
void dispatch_after_f(dispatch_time_t when, dispatch_queue_t dq, void *ctxt,
dispatch_function_t func);
void dispatch_barrier_async_f(dispatch_queue_t dq, void *ctxt,
dispatch_function_t func);
void dispatch_group_async_f(dispatch_group_t group, dispatch_queue_t dq,
void *ctxt, dispatch_function_t func);
int pthread_workqueue_additem_np(pthread_workqueue_t workq, int pthread_workqueue_additem_np(pthread_workqueue_t workq,
void *(*workitem_func)(void *), void * workitem_arg, void *(*workitem_func)(void *), void * workitem_arg,
pthread_workitem_handle_t * itemhandlep, unsigned int *gencountp); pthread_workitem_handle_t * itemhandlep, unsigned int *gencountp);