diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
| commit | 308f6ff034c928c0c4fc2ce168df7192ca2b1209 (patch) | |
| tree | 49603bf604b0d3b3e4e0f1d71d0a52380933aa36 /~emulatorman/icecat/gcc47.patch | |
| parent | 99d72f453ab00a43e11f6903bf34d6cd27962a4f (diff) | |
| parent | 964755f48fefde84fce71781d0744e2158f60814 (diff) | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/pandoc/PKGBUILD
Diffstat (limited to '~emulatorman/icecat/gcc47.patch')
| -rw-r--r-- | ~emulatorman/icecat/gcc47.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/~emulatorman/icecat/gcc47.patch b/~emulatorman/icecat/gcc47.patch deleted file mode 100644 index 829d59510..000000000 --- a/~emulatorman/icecat/gcc47.patch +++ /dev/null @@ -1,75 +0,0 @@ - -# HG changeset patch -# User Martin Stránský <stransky@redhat.com> -# Date 1328886461 -3600 -# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349 -# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049 -Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin - -diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc ---- a/ipc/chromium/src/base/file_util_linux.cc -+++ b/ipc/chromium/src/base/file_util_linux.cc -@@ -1,15 +1,18 @@ - // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - - #include "base/file_util.h" - - #include <fcntl.h> -+#if defined(ANDROID) || defined(OS_POSIX) -+#include <unistd.h> -+#endif - - #include <string> - #include <vector> - - #include "base/eintr_wrapper.h" - #include "base/file_path.h" - #include "base/string_util.h" - -diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc ---- a/ipc/chromium/src/base/message_pump_libevent.cc -+++ b/ipc/chromium/src/base/message_pump_libevent.cc -@@ -1,16 +1,19 @@ - // Copyright (c) 2008 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - - #include "base/message_pump_libevent.h" - - #include <errno.h> - #include <fcntl.h> -+#if defined(ANDROID) || defined(OS_POSIX) -+#include <unistd.h> -+#endif - - #include "eintr_wrapper.h" - #include "base/logging.h" - #include "base/scoped_nsautorelease_pool.h" - #include "base/scoped_ptr.h" - #include "base/time.h" - #include "third_party/libevent/event.h" - -diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc ---- a/ipc/chromium/src/base/time_posix.cc -+++ b/ipc/chromium/src/base/time_posix.cc -@@ -8,16 +8,19 @@ - #include <mach/mach_time.h> - #endif - #include <sys/time.h> - #ifdef ANDROID - #include <time64.h> - #else - #include <time.h> - #endif -+#if defined(ANDROID) || defined(OS_POSIX) -+#include <unistd.h> -+#endif - - #include <limits> - - #include "base/basictypes.h" - #include "base/logging.h" - - namespace base { |