Merge from vendor branch TNF:
[pkgsrcv2.git] / mail / thunderbird / patches / patch-mozilla_ipc_chromium_src_base_process__util.h
1 $NetBSD$
2
3 --- mozilla/ipc/chromium/src/base/process_util.h.orig   2012-02-16 10:25:01.000000000 +0000
4 +++ mozilla/ipc/chromium/src/base/process_util.h
5 @@ -14,7 +14,6 @@
6  #include <windows.h>
7  #include <tlhelp32.h>
8  #elif defined(OS_LINUX)
9 -#include <dirent.h>
10  #include <limits.h>
11  #include <sys/types.h>
12  #elif defined(OS_MACOSX)
13 @@ -280,6 +279,7 @@ class NamedProcessIterator {
14    const ProcessEntry* NextProcessEntry();
15  
16   private:
17 +#if !defined(OS_BSD)
18    // Determines whether there's another process (regardless of executable)
19    // left in the list of all processes.  Returns true and sets entry_ to
20    // that process's info if there is one, false otherwise.
21 @@ -292,18 +292,24 @@ class NamedProcessIterator {
22    void InitProcessEntry(ProcessEntry* entry);
23  
24    std::wstring executable_name_;
25 +#endif
26  
27  #if defined(OS_WIN)
28    HANDLE snapshot_;
29    bool started_iteration_;
30  #elif defined(OS_LINUX)
31    DIR *procfs_dir_;
32 +#elif defined(OS_BSD)
33 +  std::vector<ProcessEntry> content;
34 +  size_t nextEntry;
35  #elif defined(OS_MACOSX)
36    std::vector<kinfo_proc> kinfo_procs_;
37    size_t index_of_kinfo_proc_;
38  #endif
39 +#if !defined(OS_BSD)
40    ProcessEntry entry_;
41    const ProcessFilter* filter_;
42 +#endif
43  
44    DISALLOW_EVIL_CONSTRUCTORS(NamedProcessIterator);
45  };