diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-29 13:42:49 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-29 13:42:49 -0800 |
| commit | 257123ca70f1895cd6fd37c75ebaeef2de9e17b1 (patch) | |
| tree | 1b45635ad754be8ec2b653a730c9734d4c76667b /src/client/mac | |
| parent | Remove use of deprecated CFURLCreateDataAndPropertiesFromResource function. (diff) | |
| download | breakpad-257123ca70f1895cd6fd37c75ebaeef2de9e17b1.tar.xz | |
Let breakpad build with -Wall on OS X and Linux.
A=thakis@chromium.org
Original Review: https://codereview.chromium.org/1550933002/
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/1554613002 .
Diffstat (limited to 'src/client/mac')
| -rw-r--r-- | src/client/mac/handler/dynamic_images.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/client/mac/handler/dynamic_images.cc b/src/client/mac/handler/dynamic_images.cc index 3dc4f3b4..cdba6df4 100644 --- a/src/client/mac/handler/dynamic_images.cc +++ b/src/client/mac/handler/dynamic_images.cc @@ -364,7 +364,7 @@ static uint64_t LookupSymbol(const char* symbol_name, return list.n_value; } -#if TARGET_OS_IPHONE +#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 static bool HasTaskDyldInfo() { return true; } @@ -381,13 +381,9 @@ static SInt32 GetOSVersion() { } static bool HasTaskDyldInfo() { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 - return true; -#else return GetOSVersion() >= 0x1060; -#endif } -#endif // TARGET_OS_IPHONE +#endif // TARGET_OS_IPHONE || MAC_OS_X_VERSION_MIN_REQUIRED >= 10_6 uint64_t DynamicImages::GetDyldAllImageInfosPointer() { if (HasTaskDyldInfo()) { |