mozilla-gcc47.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Mon, 16 Apr 2012 11:47:04 +0200
branchfirefox12
changeset 422 35be97f6fdf7
child 424 44d79c1f5826
permissions -rw-r--r--
fix some gcc 4.7 issues (not complete; still not building)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
422
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# Parent 7014aafc8d4c8862f3064adc46536f6aa9730644
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
Patch to make Mozilla build with gcc 4.7, including
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
- Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13)
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/ipc/chromium/src/base/file_util_linux.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/ipc/chromium/src/base/file_util_linux.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
@@ -1,15 +1,18 @@
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 // Use of this source code is governed by a BSD-style license that can be
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 // found in the LICENSE file.
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 #include "base/file_util.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 #include <fcntl.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
+#if defined(ANDROID) || defined(OS_POSIX)
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+#include <unistd.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+#endif
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 #include <string>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 #include <vector>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
 #include "base/eintr_wrapper.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
 #include "base/file_path.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
 #include "base/string_util.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
--- a/ipc/chromium/src/base/message_pump_libevent.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
+++ b/ipc/chromium/src/base/message_pump_libevent.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
@@ -1,16 +1,19 @@
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
 // Use of this source code is governed by a BSD-style license that can be
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
 // found in the LICENSE file.
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
 #include "base/message_pump_libevent.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 #include <errno.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
 #include <fcntl.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
+#if defined(ANDROID) || defined(OS_POSIX)
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
+#include <unistd.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
+#endif
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
 #include "eintr_wrapper.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
 #include "base/logging.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
 #include "base/scoped_nsautorelease_pool.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 #include "base/scoped_ptr.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
 #include "base/time.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
 #include "third_party/libevent/event.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
--- a/ipc/chromium/src/base/time_posix.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    53
+++ b/ipc/chromium/src/base/time_posix.cc
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    54
@@ -8,16 +8,19 @@
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    55
 #include <mach/mach_time.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    56
 #endif
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    57
 #include <sys/time.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    58
 #ifdef ANDROID
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    59
 #include <time64.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    60
 #else
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    61
 #include <time.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    62
 #endif
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    63
+#if defined(ANDROID) || defined(OS_POSIX)
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    64
+#include <unistd.h>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    65
+#endif
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    66
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    67
 #include <limits>
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    68
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    69
 #include "base/basictypes.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    70
 #include "base/logging.h"
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    71
 
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    72
 namespace base {
35be97f6fdf7 fix some gcc 4.7 issues (not complete; still not building)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    73