diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-22 21:01:46 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-22 21:01:46 -0700 |
commit | 758bed52afd57bd140409bfbbeabb4a89b5182d3 (patch) | |
tree | 29883f4b2b1a5e6f5070b02888a0d06241d8f19a /lib | |
parent | 967a72c957b41e7af82ddfae8487066d6735f5b8 (diff) | |
download | emacs-758bed52afd57bd140409bfbbeabb4a89b5182d3.tar.gz |
Merge from gnulib.
This incorporates:
2013-10-14 acl: allow cross-compilation to Gentoo
2013-10-18 extern-inline: make safe for -Wundef usage
2013-09-30 fpending: use pure+const function attrs
* lib/fpending.h, m4/acl.m4, m4/extern-inline.m4: Update from gnulib.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/fpending.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fpending.h b/lib/fpending.h index 4eca3f18e17..30d67fcd74f 100644 --- a/lib/fpending.h +++ b/lib/fpending.h @@ -25,5 +25,5 @@ #endif #ifndef __fpending -size_t __fpending (FILE *); +size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE; #endif |