Merge branch 'master' of https://github.com/sbahra/ck into cohort

ck_pring
Brendon Scheinman 12 years ago
commit 140256179c

@ -32,16 +32,20 @@
#ifdef __linux__ #ifdef __linux__
#include <sched.h> #include <sched.h>
#include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#elif defined(__MACH__) #elif defined(__MACH__)
#include <mach/mach.h> #include <mach/mach.h>
#include <mach/thread_policy.h> #include <mach/thread_policy.h>
#include <unistd.h> #include <unistd.h>
#elif defined(_WIN32) #endif
#if defined(_WIN32)
#include <assert.h> #include <assert.h>
#include <windows.h> #include <windows.h>
#else
#include <signal.h>
#include <unistd.h>
#endif #endif
#ifndef CORES #ifndef CORES

Loading…
Cancel
Save