diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-10-17 23:15:03 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-10-17 23:15:03 +0200 |
| commit | 9a85d8539c1685b90599a77c5b7872c8ce1a86c2 (patch) | |
| tree | c19561297eaf15ba4767e03f781fbc4b3681a338 /lib-src | |
| parent | 8cd879af4a393715c1c7f44a174248e85f7810ab (diff) | |
| parent | 27067208fd133e8b9530aafe43b0eed13ec08c21 (diff) | |
| download | emacs-9a85d8539c1685b90599a77c5b7872c8ce1a86c2.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/ntlib.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 26525b6e655..e2de4e75afa 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-10-17 Eli Zaretskii <eliz@gnu.org> + + * ntlib.c: Include <mbstring.h>, to avoid compiler warning about + _mbspbrk. + 2012-10-08 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (obj): Add cygw32.o. diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index feaad1c1bb7..4e125eb6d73 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c @@ -30,6 +30,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <errno.h> #include <ctype.h> #include <sys/timeb.h> +#include <mbstring.h> #include "ntlib.h" |