diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | base/base_paths_posix.cc | 2 | ||||
| -rw-r--r-- | base/process_util_posix.cc | 5 | ||||
| -rw-r--r-- | base/third_party/nspr/prcpucfg.h | 2 | ||||
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 2 |
5 files changed, 10 insertions, 2 deletions
@@ -64,3 +64,4 @@ Alexander Sulfrian <alexander@sulfrian.net> Philippe Beaudoin <philippe.beaudoin@gmail.com> Mark Hahnenberg <mhahnenb@gmail.com> Alex Gartrell <alexgartrell@gmail.com> +James Choi <jchoi42@pha.jhu.edu> diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc index bcbc578..51bb593 100644 --- a/base/base_paths_posix.cc +++ b/base/base_paths_posix.cc @@ -20,6 +20,8 @@ namespace base { #if defined(OS_LINUX) const char kSelfExe[] = "/proc/self/exe"; +#elif defined(OS_SOLARIS) +const char kSelfExe[] = getexecname(); #elif defined(OS_FREEBSD) const char kSelfExe[] = "/proc/curproc/file"; #endif diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index a29304d..cca07dd 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -180,6 +180,9 @@ void CloseSuperfluousFds(const base::InjectiveMultimap& saved_mapping) { #elif defined(OS_MACOSX) static const rlim_t kSystemDefaultMaxFds = 256; static const char fd_dir[] = "/dev/fd"; +#elif defined(OS_SOLARIS) + static const rlim_t kSystemDefaultMaxFds = 8192; + static const char fd_dir[] = "/dev/fd"; #elif defined(OS_FREEBSD) static const rlim_t kSystemDefaultMaxFds = 8192; static const char fd_dir[] = "/dev/fd"; @@ -266,7 +269,7 @@ void CloseSuperfluousFds(const base::InjectiveMultimap& saved_mapping) { void SetAllFDsToCloseOnExec() { #if defined(OS_LINUX) const char fd_dir[] = "/proc/self/fd"; -#elif defined(OS_MACOSX) || defined(OS_FREEBSD) +#elif defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_SOLARIS) const char fd_dir[] = "/dev/fd"; #endif ScopedDIR dir_closer(opendir(fd_dir)); diff --git a/base/third_party/nspr/prcpucfg.h b/base/third_party/nspr/prcpucfg.h index cbd5eed..c0dc1f0 100644 --- a/base/third_party/nspr/prcpucfg.h +++ b/base/third_party/nspr/prcpucfg.h @@ -40,6 +40,8 @@ #include "base/third_party/nspr/prcpucfg_freebsd.h" #elif defined(__OpenBSD__) #include "base/third_party/nspr/prcpucfg_openbsd.h" +#elif defined(__Solaris__) +#include "base/third_party/nspr/prcpucfg_solaris.h" #else #error Provide a prcpucfg.h appropriate for your platform #endif diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index 0b335e6..b4b8c9f 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -69,7 +69,7 @@ /* BEGIN GOOGLE MODIFICATIONS */ /* On Linux and Mac, be sure to set Mozilla-specific macros. */ -#if defined(OS_LINUX) || defined(OS_FREEBSD) +#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_SOLARIS) #define XP_UNIX 1 #define MOZ_X11 1 #endif |