845f11032a
[ci skip] Closes: #2538 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
81 lines
3.8 KiB
Diff
81 lines
3.8 KiB
Diff
From 7e0a2a72d16c11699558054c01a2082517f7dac1 Mon Sep 17 00:00:00 2001
|
|
From: Felix Janda <felix.janda@posteo.de>
|
|
Date: Sun, 1 Feb 2015 14:40:41 +0100
|
|
Subject: [PATCH 6/6] <sys/signal.h> is a nonportable alias for <signal.h>
|
|
|
|
---
|
|
qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
|
|
qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/signal.h | 35 ---------------------------
|
|
qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/common.gyp | 1 -
|
|
3 files changed, 1 insertion(+), 37 deletions(-)
|
|
delete mode 100644 src/common/android/include/sys/signal.h
|
|
|
|
diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
|
|
index 3e2d196..cc3b1d3 100644
|
|
--- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
|
@@ -78,7 +78,7 @@
|
|
#include <sys/wait.h>
|
|
#include <unistd.h>
|
|
|
|
-#include <sys/signal.h>
|
|
+#include <signal.h>
|
|
#include <sys/ucontext.h>
|
|
#include <sys/user.h>
|
|
#include <ucontext.h>
|
|
diff --git a/src/common/android/include/sys/signal.h b/src/common/android/include/sys/signal.h
|
|
deleted file mode 100644
|
|
index 20c81e9..0000000
|
|
--- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/android/include/sys/signal.h
|
|
+++ /dev/null
|
|
@@ -1,35 +0,0 @@
|
|
-// Copyright (c) 2012, Google Inc.
|
|
-// All rights reserved.
|
|
-//
|
|
-// Redistribution and use in source and binary forms, with or without
|
|
-// modification, are permitted provided that the following conditions are
|
|
-// met:
|
|
-//
|
|
-// * Redistributions of source code must retain the above copyright
|
|
-// notice, this list of conditions and the following disclaimer.
|
|
-// * Redistributions in binary form must reproduce the above
|
|
-// copyright notice, this list of conditions and the following disclaimer
|
|
-// in the documentation and/or other materials provided with the
|
|
-// distribution.
|
|
-// * Neither the name of Google Inc. nor the names of its
|
|
-// contributors may be used to endorse or promote products derived from
|
|
-// this software without specific prior written permission.
|
|
-//
|
|
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
-// 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_SYS_SIGNAL_H
|
|
-#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
|
|
-
|
|
-#include <signal.h>
|
|
-
|
|
-#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
|
|
diff --git a/src/common/common.gyp b/src/common/common.gyp
|
|
index c49ff85..1a6b1ae 100644
|
|
--- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/common.gyp
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/common.gyp
|
|
@@ -47,7 +47,6 @@
|
|
'android/include/link.h',
|
|
'android/include/sgidefs.h',
|
|
'android/include/sys/procfs.h',
|
|
- 'android/include/sys/signal.h',
|
|
'android/include/sys/user.h',
|
|
'android/include/ucontext.h',
|
|
'android/testing/include/wchar.h',
|
|
--
|
|
2.0.5
|
|
|