diff options
| author | Vincent Belaïche | 2016-07-28 18:12:50 +0200 |
|---|---|---|
| committer | Vincent Belaïche | 2016-07-28 18:12:50 +0200 |
| commit | 90ab699c4f281d0c9a9b71f3eb4c8493d00fcf4f (patch) | |
| tree | df3235d89ee8e4d32571b8a8521f75f7576913c2 /src/gmalloc.c | |
| parent | 41b28dea8587c13b0bc59c1ec70b65afab3aeeca (diff) | |
| parent | ec359399a47f852b4d022a30245449438e349193 (diff) | |
| download | emacs-90ab699c4f281d0c9a9b71f3eb4c8493d00fcf4f.tar.gz emacs-90ab699c4f281d0c9a9b71f3eb4c8493d00fcf4f.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index d795c13f616..483d05c5c61 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -44,7 +44,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. | |||
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | #ifdef HAVE_MALLOC_H | 46 | #ifdef HAVE_MALLOC_H |
| 47 | # if 4 < __GNUC__ + (2 <= __GNUC_MINOR__) | 47 | # if GNUC_PREREQ (4, 2, 0) |
| 48 | # pragma GCC diagnostic ignored "-Wdeprecated-declarations" | 48 | # pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
| 49 | # endif | 49 | # endif |
| 50 | # include <malloc.h> | 50 | # include <malloc.h> |