emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: replace <values.h> with <limits.h> plus <float.h>

Browse Source 
This fixes a compilation problem on Android which lacks values.h.

Reference(s):
https://gitorious.org/procps/procps/merge_requests/26

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Fredrik Fornwall 2014-08-01 00:00:00 -05:00 committed by Jaromir Capik
parent 2538b5ac03
commit dfe1f7d104
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
top/top.c
View File

@ -25,6 +25,8 @@
#endif #endif
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <float.h>
#include <limits.h>
#include <pwd.h> #include <pwd.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
@ -37,7 +39,6 @@
#include <termios.h> #include <termios.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <values.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/resource.h> #include <sys/resource.h>
@ -1266,7 +1267,7 @@ static int mkfloat (const char *str, float *num, int whole) {
*num = (float)strtol(str, &ep, 0); *num = (float)strtol(str, &ep, 0);
else else
*num = strtof(str, &ep); *num = strtof(str, &ep);
if (ep != str && *ep == '\0' && *num < MAXINT) if (ep != str && *ep == '\0' && *num < INT_MAX)
return 1; return 1;
return 0; return 0;
} // end: mkfloat } // end: mkfloat
@ -1860,7 +1861,7 @@ static void adj_geometry (void) {
between us and the great-beyond... */ between us and the great-beyond... */
if (Batch) { if (Batch) {
if (w_cols) Screen_cols = w_cols; if (w_cols) Screen_cols = w_cols;
Screen_rows = w_rows ? w_rows : MAXINT; Screen_rows = w_rows ? w_rows : INT_MAX;
Pseudo_size = (sizeof(*Pseudo_screen) * ROWMAXSIZ); Pseudo_size = (sizeof(*Pseudo_screen) * ROWMAXSIZ);
} else { } else {
if (w_cols && w_cols < Screen_cols) Screen_cols = w_cols; if (w_cols && w_cols < Screen_cols) Screen_cols = w_cols;
@ -3652,7 +3653,7 @@ static void parse_args (char **args) {
. bunched args are actually handled properly and none are ignored . bunched args are actually handled properly and none are ignored
. we tolerate NO whitespace and NO switches -- maybe too tolerant? */ . we tolerate NO whitespace and NO switches -- maybe too tolerant? */
static const char numbs_str[] = "+,-.0123456789"; static const char numbs_str[] = "+,-.0123456789";
float tmp_delay = MAXFLOAT; float tmp_delay = FLT_MAX;
int i; int i;
while (*args) { while (*args) {
@ -3791,7 +3792,7 @@ static void parse_args (char **args) {
} // end: while (*args) } // end: while (*args)
// fixup delay time, maybe... // fixup delay time, maybe...
if (MAXFLOAT > tmp_delay) { if (FLT_MAX > tmp_delay) {
if (Secure_mode) if (Secure_mode)
error_exit(N_txt(DELAY_secure_txt)); error_exit(N_txt(DELAY_secure_txt));
Rc.delay_time = tmp_delay; Rc.delay_time = tmp_delay;