diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 22:41:59 +0100 |
| commit | 329d35ab57451a668331667221eef7352ef04ef6 (patch) | |
| tree | e9cfdb38aa59f09c46df71a856de6ade171f380e /ipc/chromium/src/base/process_util.h | |
| parent | d0da27ef572152d1fdd82a9ac15bd5c23ad68160 (diff) | |
| parent | cffb44547ae7997e5eaf71c644bd626eeb3bba00 (diff) | |
| download | UXP-2020.01.12.tar UXP-2020.01.12.tar.gz UXP-2020.01.12.tar.lz UXP-2020.01.12.tar.xz UXP-2020.01.12.zip | |
Merge branch 'release' into Basilisk-releasev2020.01.12
Diffstat (limited to 'ipc/chromium/src/base/process_util.h')
| -rw-r--r-- | ipc/chromium/src/base/process_util.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/ipc/chromium/src/base/process_util.h b/ipc/chromium/src/base/process_util.h index 4df1f29fb..4bb125681 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(OS_SOLARIS) || defined(__GLIBC__) #include <dirent.h> #include <limits.h> #include <sys/types.h> @@ -39,26 +39,7 @@ #include "base/command_line.h" #include "base/process.h" -#if defined(OS_WIN) -typedef PROCESSENTRY32 ProcessEntry; -typedef IO_COUNTERS IoCounters; -#elif defined(OS_POSIX) -// TODO(port): we should not rely on a Win32 structure. -struct ProcessEntry { - int pid; - int ppid; - char szExeFile[NAME_MAX + 1]; -}; - -struct IoCounters { - unsigned long long ReadOperationCount; - unsigned long long WriteOperationCount; - unsigned long long OtherOperationCount; - unsigned long long ReadTransferCount; - unsigned long long WriteTransferCount; - unsigned long long OtherTransferCount; -}; - +#if defined(OS_POSIX) #include "base/file_descriptor_shuffle.h" #endif |