| Index: base/logging.cc
|
| diff --git a/base/logging.cc b/base/logging.cc
|
| index d66f01b71d56c0e4d3eb69a9db9696d6cc1da7f9..037411f95af981833cf4fc893928899bcd3283d3 100644
|
| --- a/base/logging.cc
|
| +++ b/base/logging.cc
|
| @@ -2,11 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "base/basictypes.h"
|
| #include "base/logging.h"
|
| +#include "build/build_config.h"
|
|
|
| #if defined(OS_WIN)
|
| #include <io.h>
|
| #include <windows.h>
|
| +
|
| typedef HANDLE FileHandle;
|
| typedef HANDLE MutexHandle;
|
| // Windows warns on using write(). It prefers _write().
|
| @@ -14,10 +17,7 @@ typedef HANDLE MutexHandle;
|
| // Windows doesn't define STDERR_FILENO. Define it here.
|
| #define STDERR_FILENO 2
|
| #elif defined(OS_MACOSX)
|
| -#include <CoreFoundation/CoreFoundation.h>
|
| -#include <mach/mach.h>
|
| #include <mach/mach_time.h>
|
| -#include <mach-o/dyld.h>
|
| #elif defined(OS_POSIX)
|
| #if defined(OS_NACL)
|
| #include <sys/nacl_syscalls.h>
|
| @@ -29,21 +29,30 @@ typedef HANDLE MutexHandle;
|
| #endif
|
|
|
| #if defined(OS_POSIX)
|
| -#include <errno.h>
|
| #include <pthread.h>
|
| -#include <stdlib.h>
|
| #include <stdio.h>
|
| #include <string.h>
|
| #include <unistd.h>
|
| +
|
| #define MAX_PATH PATH_MAX
|
| typedef FILE* FileHandle;
|
| typedef pthread_mutex_t* MutexHandle;
|
| #endif
|
|
|
| +#include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h>
|
| +#include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFString.h>
|
| +#include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFUserNotification.h>
|
| +#include <mach/mach_init.h>
|
| +#include <stdbool.h>
|
| +#include <stddef.h>
|
| +#include <sys/errno.h>
|
| +#include <sys/syslimits.h>
|
| +#include <algorithm>
|
| #include <ctime>
|
| #include <iomanip>
|
| -#include <cstring>
|
| -#include <algorithm>
|
| +#include <ostream>
|
| +#include <sstream>
|
| +#include <string>
|
|
|
| #include "base/base_switches.h"
|
| #include "base/command_line.h"
|
|
|