diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:15 +0700 |
| commit | 5f6f2162512106adf120d4b528bb125e93e34429 (patch) | |
| tree | 7d7449f755633c263be7125ad58d21cc3ca5b8a7 /include/libbb.h | |
| parent | 9db69882bee2d528d706d61d34ef7741122330be (diff) | |
| parent | a116552869db5e7793ae10968eb3c962c69b3d8c (diff) | |
| download | busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2 busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/libbb.h')
| -rw-r--r-- | include/libbb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 715f1e102..fdd920f3c 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -1440,6 +1440,7 @@ typedef struct procps_status_t { | |||
| 1440 | char *argv0; | 1440 | char *argv0; |
| 1441 | char *exe; | 1441 | char *exe; |
| 1442 | IF_SELINUX(char *context;) | 1442 | IF_SELINUX(char *context;) |
| 1443 | IF_FEATURE_SHOW_THREADS(unsigned main_thread_pid;) | ||
| 1443 | /* Everything below must contain no ptrs to malloc'ed data: | 1444 | /* Everything below must contain no ptrs to malloc'ed data: |
| 1444 | * it is memset(0) for each process in procps_scan() */ | 1445 | * it is memset(0) for each process in procps_scan() */ |
| 1445 | unsigned long vsz, rss; /* we round it to kbytes */ | 1446 | unsigned long vsz, rss; /* we round it to kbytes */ |