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