| OLD | NEW |
| 1 // Copyright 2014 The Crashpad Authors. All rights reserved. | 1 // Copyright 2014 The Crashpad Authors. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 // opened, or if the named symbol cannot be found in libmacho. | 51 // opened, or if the named symbol cannot be found in libmacho. |
| 52 void* LookUpSystemLibMachOSymbol(const char* symbol) { | 52 void* LookUpSystemLibMachOSymbol(const char* symbol) { |
| 53 static void* dl_handle = SystemLibMachOHandle(); | 53 static void* dl_handle = SystemLibMachOHandle(); |
| 54 if (!dl_handle) { | 54 if (!dl_handle) { |
| 55 return nullptr; | 55 return nullptr; |
| 56 } | 56 } |
| 57 return dlsym(dl_handle, symbol); | 57 return dlsym(dl_handle, symbol); |
| 58 } | 58 } |
| 59 | 59 |
| 60 #ifndef __LP64__ | 60 #ifndef __LP64__ |
| 61 typedef mach_header MachHeader; | 61 using MachHeader = mach_header; |
| 62 #else | 62 #else |
| 63 typedef mach_header_64 MachHeader; | 63 using MachHeader = mach_header_64; |
| 64 #endif | 64 #endif |
| 65 | 65 |
| 66 typedef uint8_t*(*GetSectionDataType)( | 66 using GetSectionDataType = |
| 67 const MachHeader*, const char*, const char*, unsigned long*); | 67 uint8_t*(*)(const MachHeader*, const char*, const char*, unsigned long*); |
| 68 typedef uint8_t*(*GetSegmentDataType)( | 68 using GetSegmentDataType = |
| 69 const MachHeader*, const char*, unsigned long*); | 69 uint8_t*(*)(const MachHeader*, const char*, unsigned long*); |
| 70 | 70 |
| 71 } // namespace | 71 } // namespace |
| 72 | 72 |
| 73 extern "C" { | 73 extern "C" { |
| 74 | 74 |
| 75 // These implementations look up their functions in libmacho at run time. If | 75 // These implementations look up their functions in libmacho at run time. If |
| 76 // the system libmacho provides these functions as it normally does on Mac OS X | 76 // the system libmacho provides these functions as it normally does on Mac OS X |
| 77 // 10.7 and later, the system’s versions are used directly. Otherwise, the | 77 // 10.7 and later, the system’s versions are used directly. Otherwise, the |
| 78 // versions in third_party/apple_cctools are used, which are actually just | 78 // versions in third_party/apple_cctools are used, which are actually just |
| 79 // copies of the system’s functions. | 79 // copies of the system’s functions. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 98 LookUpSystemLibMachOSymbol("getsegmentdata")); | 98 LookUpSystemLibMachOSymbol("getsegmentdata")); |
| 99 if (system_getsegmentdata) { | 99 if (system_getsegmentdata) { |
| 100 return system_getsegmentdata(mhp, segname, size); | 100 return system_getsegmentdata(mhp, segname, size); |
| 101 } | 101 } |
| 102 return crashpad_getsegmentdata(mhp, segname, size); | 102 return crashpad_getsegmentdata(mhp, segname, size); |
| 103 } | 103 } |
| 104 | 104 |
| 105 } // extern "C" | 105 } // extern "C" |
| 106 | 106 |
| 107 #endif // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7 | 107 #endif // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7 |
| OLD | NEW |