diff options
author | Renato Botelho <renato@netgate.com> | 2015-11-11 11:08:21 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-11-11 11:08:21 -0200 |
commit | 4119672798028ff673a738690b48575973689004 (patch) | |
tree | 6a05ea1f50fa6610fe798bbf45852d32a83ab41a /sbin | |
parent | 5e6268df600406a1570e822ac652576059d820e3 (diff) | |
parent | 2867f2c1d4795c2446a1c1d0b30db57d3aaca364 (diff) | |
download | FreeBSD-src-4119672798028ff673a738690b48575973689004.zip FreeBSD-src-4119672798028ff673a738690b48575973689004.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/camcontrol/modeedit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c index 00ab974..8262c3c 100644 --- a/sbin/camcontrol/modeedit.c +++ b/sbin/camcontrol/modeedit.c @@ -246,7 +246,7 @@ editentry_set(char *name, char *newvalue, int editonly) * currently workaround it (even for int64's), so we have to kludge it. */ #define RESOLUTION_MAX(size) ((resolution * (size) == 32)? \ - (int)0xffffffff: (1 << (resolution * (size))) - 1) + INT_MAX: (1 << (resolution * (size))) - 1) assert(newvalue != NULL); if (*newvalue == '\0') |