From: Carsten Schoenert Date: Sun, 24 Apr 2016 18:49:46 +0000 (+0200) Subject: adding missed HURD adoptions X-Git-Tag: archive/raspbian/1%60.7.2-1+rpi1^2~19 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a31a6717533a08dbaa64bfe1e86179c30d4504aa;p=thunderbird.git adding missed HURD adoptions Based on https://lists.alioth.debian.org/pipermail/pkg-mozilla-maintainers/2016-April/027634.html Gbp-Pq: Topic porting-kfreebsd-hurd Gbp-Pq: Name adding-missed-HURD-adoptions.patch --- diff --git a/ipc/chromium/src/base/file_util_posix.cc b/ipc/chromium/src/base/file_util_posix.cc index 2b0d221e27..71346d835f 100644 --- a/ipc/chromium/src/base/file_util_posix.cc +++ b/ipc/chromium/src/base/file_util_posix.cc @@ -263,7 +263,7 @@ bool GetTempDir(FilePath* path) { } bool GetShmemTempDir(FilePath* path) { -#if defined(OS_LINUX) && !defined(ANDROID) +#if (defined(OS_LINUX) && !defined(ANDROID)) || defined(OS_HURD) *path = FilePath("/dev/shm"); return true; #else diff --git a/ipc/chromium/src/base/platform_thread.h b/ipc/chromium/src/base/platform_thread.h index afa344cc03..0103ef17f8 100644 --- a/ipc/chromium/src/base/platform_thread.h +++ b/ipc/chromium/src/base/platform_thread.h @@ -25,7 +25,7 @@ typedef void* PlatformThreadHandle; // HANDLE #include typedef pthread_t PlatformThreadHandle; #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || \ - defined(__GLIBC__) + defined(__GLIBC__) || defined(OS_HURD) #include typedef pid_t PlatformThreadId; #elif defined(OS_BSD) diff --git a/ipc/chromium/src/base/platform_thread_posix.cc b/ipc/chromium/src/base/platform_thread_posix.cc index 5f52eebf9b..816e8ffdc9 100644 --- a/ipc/chromium/src/base/platform_thread_posix.cc +++ b/ipc/chromium/src/base/platform_thread_posix.cc @@ -57,7 +57,7 @@ PlatformThreadId PlatformThread::CurrentId() { #else return getpid(); #endif -#elif defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(__GLIBC__) +#elif defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(__GLIBC__) || defined(OS_HURD) return (intptr_t)(pthread_self()); #elif defined(OS_NETBSD) return _lwp_self(); diff --git a/ipc/chromium/src/base/port.h b/ipc/chromium/src/base/port.h index 322626b596..3d500b6203 100644 --- a/ipc/chromium/src/base/port.h +++ b/ipc/chromium/src/base/port.h @@ -58,7 +58,7 @@ namespace base { // Define an OS-neutral wrapper for shared library entry points #if defined(OS_WIN) #define API_CALL __stdcall -#elif defined(OS_LINUX) || defined(OS_MACOSX) +#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_HURD) #define API_CALL #endif diff --git a/ipc/chromium/src/base/process_util.h b/ipc/chromium/src/base/process_util.h index 09006e3c13..29aabfde97 100644 --- a/ipc/chromium/src/base/process_util.h +++ b/ipc/chromium/src/base/process_util.h @@ -19,7 +19,7 @@ #ifndef STDOUT_FILENO #define STDOUT_FILENO 1 #endif -#elif defined(OS_LINUX) || defined(__GLIBC__) +#elif defined(OS_LINUX) || defined(__GLIBC__) || defined(OS_HURD) #include #include #include diff --git a/ipc/chromium/src/base/process_util_posix.cc b/ipc/chromium/src/base/process_util_posix.cc index 40f8209751..c1a48078fc 100644 --- a/ipc/chromium/src/base/process_util_posix.cc +++ b/ipc/chromium/src/base/process_util_posix.cc @@ -130,6 +130,10 @@ void CloseSuperfluousFds(const base::InjectiveMultimap& saved_mapping) { static const rlim_t kSystemDefaultMaxFds = 1024; // at least /dev/fd will exist static const char kFDDir[] = "/dev/fd"; +#elif defined(OS_HURD) + static const rlim_t kSystemDefaultMaxFds = 1024; + // Currently always empty, but it exists + static const char kFDDir[] = "/dev/fd"; #endif // Get the maximum number of FDs possible. @@ -205,7 +209,7 @@ void CloseSuperfluousFds(const base::InjectiveMultimap& saved_mapping) { void SetAllFDsToCloseOnExec() { #if defined(OS_LINUX) || defined(OS_SOLARIS) const char fd_dir[] = "/proc/self/fd"; -#elif defined(OS_MACOSX) || defined(OS_BSD) +#elif defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_HURD) const char fd_dir[] = "/dev/fd"; #endif ScopedDIR dir_closer(opendir(fd_dir)); diff --git a/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h b/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h index f048e72be1..8bb0b596f5 100644 --- a/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h +++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h @@ -7,7 +7,7 @@ #include -#if defined SIP_OS_LINUX +#if defined SIP_OS_LINUX || defined(SIP_OS_HURD) #include "cpr_linux_types.h" #elif defined SIP_OS_WINDOWS #include "cpr_win_types.h" diff --git a/media/webrtc/trunk/build/build_config.h b/media/webrtc/trunk/build/build_config.h index 168fbd67f4..312674baab 100644 --- a/media/webrtc/trunk/build/build_config.h +++ b/media/webrtc/trunk/build/build_config.h @@ -37,6 +37,9 @@ #elif defined(_WIN32) #define OS_WIN 1 #define TOOLKIT_VIEWS 1 +#elif defined(__GNU__) +#define OS_HURD 1 +#define TOOLKIT_GTK #elif defined(__DragonFly__) #define OS_DRAGONFLY 1 #define TOOLKIT_GTK @@ -70,7 +73,8 @@ // For access to standard POSIXish features, use OS_POSIX instead of a // more specific macro. #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_SOLARIS) || defined(OS_ANDROID) || defined(OS_NACL) + defined(OS_SOLARIS) || defined(OS_ANDROID) || defined(OS_NACL) || \ + defined(OS_HURD) #define OS_POSIX 1 #endif diff --git a/security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-port.h b/security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-port.h index f376dfa004..0f702ebb6b 100644 --- a/security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-port.h +++ b/security/nss/gtests/google_test/gtest/include/gtest/internal/gtest-port.h @@ -345,6 +345,8 @@ # define GTEST_OS_OPENBSD 1 #elif defined __QNX__ # define GTEST_OS_QNX 1 +#elif defined(__GNU__) +# define GTEST_OS_HURD 1 #endif // __CYGWIN__ // Macros for disabling Microsoft Visual C++ warnings. @@ -611,7 +613,7 @@ struct _RTL_CRITICAL_SECTION; // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 // to your compiler flags. # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \ - || GTEST_OS_QNX) + || GTEST_OS_QNX || GTEST_OS_HURD) #endif // GTEST_HAS_PTHREAD #if GTEST_HAS_PTHREAD @@ -791,7 +793,7 @@ using ::std::tuple_size; (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX) + GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_HURD) # define GTEST_HAS_DEATH_TEST 1 # include // NOLINT #endif diff --git a/security/sandbox/chromium/build/build_config.h b/security/sandbox/chromium/build/build_config.h index 8e5fcd7ded..91720912fd 100644 --- a/security/sandbox/chromium/build/build_config.h +++ b/security/sandbox/chromium/build/build_config.h @@ -47,6 +47,8 @@ // we really are using glibc, not uClibc pretending to be glibc #define LIBC_GLIBC 1 #endif +#elif defined(__GNU__) +#define OS_HURD 1 #elif defined(_WIN32) #define OS_WIN 1 #elif defined(__Fuchsia__) @@ -84,7 +86,7 @@ #if defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_MACOSX) || \ defined(OS_NACL) || defined(OS_NETBSD) || defined(OS_OPENBSD) || \ - defined(OS_QNX) || defined(OS_SOLARIS) + defined(OS_QNX) || defined(OS_SOLARIS) || defined(OS_HURD) #define OS_POSIX 1 #endif