diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /lib | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ignore-value.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/ignore-value.h b/lib/ignore-value.h index 63ecde85136..ebd6bf42f56 100644 --- a/lib/ignore-value.h +++ b/lib/ignore-value.h | |||
| @@ -33,15 +33,16 @@ | |||
| 33 | declared with attribute warn_unused_result". */ | 33 | declared with attribute warn_unused_result". */ |
| 34 | 34 | ||
| 35 | #ifndef _GL_IGNORE_VALUE_H | 35 | #ifndef _GL_IGNORE_VALUE_H |
| 36 | # define _GL_IGNORE_VALUE_H | 36 | #define _GL_IGNORE_VALUE_H |
| 37 | 37 | ||
| 38 | /* The __attribute__((__warn_unused_result__)) feature | 38 | /* The __attribute__((__warn_unused_result__)) feature |
| 39 | is available in gcc versions 3.4 and newer, | 39 | is available in gcc versions 3.4 and newer, |
| 40 | while the typeof feature has been available since 2.7 at least. */ | 40 | while the typeof feature has been available since 2.7 at least. */ |
| 41 | # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) | 41 | #if 3 < __GNUC__ + (4 <= __GNUC_MINOR__) |
| 42 | # define ignore_value(x) ((void) (x)) | 42 | # define ignore_value(x) \ |
| 43 | # else | 43 | (__extension__ ({ __typeof__ (x) __x = (x); (void) __x; })) |
| 44 | # define ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; })) | 44 | #else |
| 45 | # endif | 45 | # define ignore_value(x) ((void) (x)) |
| 46 | #endif | ||
| 46 | 47 | ||
| 47 | #endif | 48 | #endif |