Commit bda7a546 authored by zyearn's avatar zyearn

Fix clang predefined macros issue in Apple LLVM version 9.1.0

parent dd2f3d75
...@@ -20,10 +20,12 @@ ...@@ -20,10 +20,12 @@
#include <sys/resource.h> // getrusage #include <sys/resource.h> // getrusage
#include <dirent.h> // dirent #include <dirent.h> // dirent
#include <iomanip> // setw #include <iomanip> // setw
#if defined(OS_MACOSX) #if defined(__APPLE__)
#include <libproc.h> #include <libproc.h>
#include <sys/resource.h> #include <sys/resource.h>
#else
#endif #endif
#include "butil/time.h" #include "butil/time.h"
#include "butil/memory/singleton_on_pthread_once.h" #include "butil/memory/singleton_on_pthread_once.h"
#include "butil/scoped_lock.h" #include "butil/scoped_lock.h"
...@@ -444,7 +446,7 @@ static bool read_proc_io(ProcIO* s) { ...@@ -444,7 +446,7 @@ static bool read_proc_io(ProcIO* s) {
memset(s, 0, sizeof(ProcIO)); memset(s, 0, sizeof(ProcIO));
static pid_t pid = getpid(); static pid_t pid = getpid();
rusage_info_current rusage; rusage_info_current rusage;
if (proc_pid_rusage(pid, RUSAGE_INFO_CURRENT, (void **)&rusage) != 0) { if (proc_pid_rusage(pid, RUSAGE_INFO_CURRENT, (void**)&rusage) != 0) {
PLOG(WARNING) << "Fail to proc_pid_rusage"; PLOG(WARNING) << "Fail to proc_pid_rusage";
return false; return false;
} }
......
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