Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012, Google Inc. | 1 // Copyright (c) 2012, Google Inc. |
| 2 // All rights reserved. | 2 // All rights reserved. |
| 3 // | 3 // |
| 4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
| 5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
| 6 // met: | 6 // met: |
| 7 // | 7 // |
| 8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
| 9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
| 10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 | 29 |
| 30 #ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H | 30 #ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H |
| 31 #define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H | 31 #define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H |
| 32 | 32 |
| 33 /* Android doesn't provide all the data-structures required in its <link.h>. | 33 // Android doesn't provide all the data-structures required in |
| 34 Provide custom version here. */ | 34 // its <link.h> before release 21. Provide custom version here and |
| 35 // rename Bionic-provided structures to avoid conflicts. | |
| 36 | |
| 37 #define r_debug __bionic_r_debug | |
| 38 #define link_map __bionic_link_map | |
| 39 | |
| 35 #include_next <link.h> | 40 #include_next <link.h> |
| 36 | 41 |
| 42 #undef r_debug | |
| 43 #undef link_map | |
| 44 | |
|
hush (inactive)
2016/07/19 18:52:36
the block after line 48 won't be applied to 64 bit
| |
| 37 // TODO(rmcilroy): Remove this file once the ndk is updated for other | 45 // TODO(rmcilroy): Remove this file once the ndk is updated for other |
| 38 // architectures - crbug.com/358831 | 46 // architectures - crbug.com/358831 |
| 39 #if !defined(__aarch64__) && !defined(__x86_64__) && \ | 47 #if !defined(__aarch64__) && !defined(__x86_64__) && \ |
| 40 !(defined(__mips__) && _MIPS_SIM == _ABI64) | 48 !(defined(__mips__) && _MIPS_SIM == _ABI64) |
| 41 | 49 |
| 42 #ifdef __cplusplus | 50 #ifdef __cplusplus |
| 43 extern "C" { | 51 extern "C" { |
| 44 #endif // __cplusplus | 52 #endif // __cplusplus |
| 45 | 53 |
| 46 struct r_debug { | 54 struct r_debug { |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 62 struct link_map* l_prev; | 70 struct link_map* l_prev; |
| 63 }; | 71 }; |
| 64 | 72 |
| 65 #ifdef __cplusplus | 73 #ifdef __cplusplus |
| 66 } // extern "C" | 74 } // extern "C" |
| 67 #endif // __cplusplus | 75 #endif // __cplusplus |
| 68 | 76 |
| 69 #endif // !defined(__aarch64__) && !defined(__x86_64__) | 77 #endif // !defined(__aarch64__) && !defined(__x86_64__) |
| 70 | 78 |
| 71 #endif /* GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H */ | 79 #endif /* GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H */ |
| OLD | NEW |