https://bugzilla.mozilla.org/show_bug.cgi?id=1089931 --- a/toolkit/crashreporter/google-breakpad/src/common/android/include/ucontext.h +++ a/toolkit/crashreporter/google-breakpad/src/common/android/include/ucontext.h @@ -26,31 +26,30 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H #define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H #include +#include -#ifdef __BIONIC_UCONTEXT_H -#include +#ifdef __BIONIC_HAVE_UCONTEXT_H +# include_next #else - -#include +# include +#endif // __BIONIC_UCONTEXT_H #ifdef __cplusplus extern "C" { #endif // __cplusplus // Provided by src/android/common/breakpad_getcontext.S int breakpad_getcontext(ucontext_t* ucp); #define getcontext(x) breakpad_getcontext(x) #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // __BIONIC_UCONTEXT_H - #endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_UCONTEXT_H