diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:40:30 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:40:30 +0700 |
| commit | 3b5c308768d76298bb964814ecc34de47bcac0b4 (patch) | |
| tree | 795340e9d8f5e5bf9e8d895641099af343eec2a0 /libbb/procps.c | |
| parent | 2b9a0e715ec459198f486653023d963b79291da7 (diff) | |
| parent | 5fe2f863b9cee5ab0e7ac873538bce48846dbad8 (diff) | |
| download | busybox-w32-3b5c308768d76298bb964814ecc34de47bcac0b4.tar.gz busybox-w32-3b5c308768d76298bb964814ecc34de47bcac0b4.tar.bz2 busybox-w32-3b5c308768d76298bb964814ecc34de47bcac0b4.zip | |
Merge commit '06f719fd79fe15ce6fd5431bc58fcb22851de24d^'
Diffstat (limited to 'libbb/procps.c')
| -rw-r--r-- | libbb/procps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/procps.c b/libbb/procps.c index 7ffcd8dbc..ec43b221e 100644 --- a/libbb/procps.c +++ b/libbb/procps.c | |||
| @@ -121,7 +121,7 @@ void FAST_FUNC free_procps_scan(procps_status_t* sp) | |||
| 121 | free(sp); | 121 | free(sp); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | #if ENABLE_FEATURE_TOPMEM | 124 | #if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP |
| 125 | static unsigned long fast_strtoul_16(char **endptr) | 125 | static unsigned long fast_strtoul_16(char **endptr) |
| 126 | { | 126 | { |
| 127 | unsigned char c; | 127 | unsigned char c; |