diff options
| author | Kenichi Handa | 2012-10-18 09:00:39 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-18 09:00:39 +0900 |
| commit | 03d24a8276767e9618d073fa92c3a2c55d6962bf (patch) | |
| tree | 410cf3dc7cc7b8a14d6677065e043c876ef9603b /lib-src | |
| parent | b278604edf862feced13457cfed15bcf7ac63f76 (diff) | |
| parent | 27067208fd133e8b9530aafe43b0eed13ec08c21 (diff) | |
| download | emacs-03d24a8276767e9618d073fa92c3a2c55d6962bf.tar.gz emacs-03d24a8276767e9618d073fa92c3a2c55d6962bf.zip | |
merge 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 85351d7f08d..1f28000e110 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-17 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * ntlib.c: Include <mbstring.h>, to avoid compiler warning about | ||
| 4 | _mbspbrk. | ||
| 5 | |||
| 1 | 2012-10-08 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-10-08 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * makefile.w32-in (obj): Add cygw32.o. | 8 | * 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/>. */ | |||
| 30 | #include <errno.h> | 30 | #include <errno.h> |
| 31 | #include <ctype.h> | 31 | #include <ctype.h> |
| 32 | #include <sys/timeb.h> | 32 | #include <sys/timeb.h> |
| 33 | #include <mbstring.h> | ||
| 33 | 34 | ||
| 34 | #include "ntlib.h" | 35 | #include "ntlib.h" |
| 35 | 36 | ||