diff options
Diffstat (limited to 'www/chromium/files/patch-base_base__paths__posix.cc')
-rw-r--r-- | www/chromium/files/patch-base_base__paths__posix.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-base_base__paths__posix.cc b/www/chromium/files/patch-base_base__paths__posix.cc index e4e467db6322..9b6827056e06 100644 --- a/www/chromium/files/patch-base_base__paths__posix.cc +++ b/www/chromium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/base_paths_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -12,21 +12,21 @@ #include "base/process/process_metrics.h" #include "build/build_config.h" --#if defined(OS_FREEBSD) -+#if defined(OS_BSD) +-#if BUILDFLAG(IS_FREEBSD) ++#if BUILDFLAG(IS_BSD) #include <sys/param.h> #include <sys/sysctl.h> -+#if defined(OS_OPENBSD) ++#if BUILDFLAG(IS_OPENBSD) +#include <kvm.h> +#define MAXTOKENS 2 +#endif - #elif defined(OS_SOLARIS) || defined(OS_AIX) + #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX) #include <stdlib.h> #endif @@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) { *result = FilePath(bin_dir); return true; - #elif defined(OS_OPENBSD) || defined(OS_AIX) + #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) - // There is currently no way to get the executable path on OpenBSD - char* cpath; - if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) @@ -35,7 +35,7 @@ - *result = FilePath("/usr/local/chrome/chrome"); - return true; + char *cpath; -+#if !defined(OS_AIX) ++#if !BUILDFLAG(IS_AIX) + struct kinfo_file *files; + kvm_t *kd = NULL; + char errbuf[_POSIX2_LINE_MAX]; @@ -89,7 +89,7 @@ + else + *result = FilePath("/usr/local/chrome/chrome"); + return true; -+#if !defined(OS_AIX) ++#if !BUILDFLAG(IS_AIX) + } + return ret; +#endif |