Merge from trunk.

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"