diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:48:52 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:48:52 +1000 |
commit | 53899dc573f4203d5d2a030b4404f7b30f92d202 (patch) | |
tree | 5439d5c9081fbe1839893fc846d673257f36684d /include/libbb.h | |
parent | e6c77ec19ac157f85f81ac85b008ef77f229c9ac (diff) | |
parent | 9768a82eb0ef8b742034d2b22c32e0cc97633604 (diff) | |
download | busybox-w32-53899dc573f4203d5d2a030b4404f7b30f92d202.tar.gz busybox-w32-53899dc573f4203d5d2a030b4404f7b30f92d202.tar.bz2 busybox-w32-53899dc573f4203d5d2a030b4404f7b30f92d202.zip |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 3a7a8f33f..fcff7b51e 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1495,6 +1495,8 @@ procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC; | |||
1495 | void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC; | 1495 | void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC; |
1496 | pid_t *find_pid_by_name(const char* procName) FAST_FUNC; | 1496 | pid_t *find_pid_by_name(const char* procName) FAST_FUNC; |
1497 | pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC; | 1497 | pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC; |
1498 | int starts_with_cpu(const char *str) FAST_FUNC; | ||
1499 | unsigned get_cpu_count(void) FAST_FUNC; | ||
1498 | 1500 | ||
1499 | 1501 | ||
1500 | extern const char bb_uuenc_tbl_base64[]; | 1502 | extern const char bb_uuenc_tbl_base64[]; |