diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-27 09:58:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-27 09:58:43 -0700 |
| commit | 842b28a0658be1d3afdf0dbda876c4c354d3672c (patch) | |
| tree | 724d281966fb3f0aa6b6644a48ce42253a0765a4 /lib/intprops.h | |
| parent | a9f737eef69ffe03dd045df555300ae6b41d0edf (diff) | |
| download | emacs-842b28a0658be1d3afdf0dbda876c4c354d3672c.tar.gz | |
* doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.
Diffstat (limited to 'lib/intprops.h')
| -rw-r--r-- | lib/intprops.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/intprops.h b/lib/intprops.h index 293204ab43a..d722648555b 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -25,11 +25,11 @@ /* Return a integer value, converted to the same type as the integer expression E after integer type promotion. V is the unconverted value. E should not have side effects. */ -#define _GL_INT_CONVERT(e, v) ((e) - (e) + (v)) +#define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>. */ -#define _GL_INT_NEGATE_CONVERT(e, v) ((e) - (e) - (v)) +#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) /* The extra casts in the following macros work around compiler bugs, e.g., in Cray C 5.0.3.0. */ @@ -314,7 +314,7 @@ Arguments should be free of side effects. */ #define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \ op_result_overflow (a, b, \ - _GL_INT_MINIMUM ((b) - (b) + (a)), \ - _GL_INT_MAXIMUM ((b) - (b) + (a))) + _GL_INT_MINIMUM (0 * (b) + (a)), \ + _GL_INT_MAXIMUM (0 * (b) + (a))) #endif /* _GL_INTPROPS_H */ |