diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-04-01 19:28:53 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-04-01 19:28:53 +0300 |
| commit | 86e9346005b957ddadb73586c9641e68ea12a79d (patch) | |
| tree | 683c40f6e61d57905d7b7807ef42e8f1ae4038ea /src | |
| parent | cbbb6bfd46dbab26a570b853959da6ecaada4a93 (diff) | |
| download | emacs-86e9346005b957ddadb73586c9641e68ea12a79d.tar.gz | |
Fixed misc compilation warnings and errors. Dumping errors out.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 5 | ||||
| -rw-r--r-- | src/w32.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 62c1e51e298..283396acc89 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -274,6 +274,9 @@ W32_RES_LINK=@W32_RES_LINK@ ## else xfont.o FONT_OBJ=@FONT_OBJ@ +## Empty for MinGW, cm.o for the rest. +CM_OBJ=@CM_OBJ@ + LIBGPM = @LIBGPM@ ## -lresolv, or empty. @@ -344,7 +347,7 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) ## be dumped as pure by dump-emacs. base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \ - cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ + $(CM_OBJ) term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ emacs.o keyboard.o macros.o keymap.o sysdep.o \ buffer.o filelock.o insdel.o marker.o \ minibuf.o fileio.o dired.o \ diff --git a/src/w32.c b/src/w32.c index fb069c36673..0fa5970124a 100644 --- a/src/w32.c +++ b/src/w32.c @@ -4430,9 +4430,9 @@ fstat (int desc, struct stat * buf) } int -utime (const char *name, struct _utimbuf *times) +utime (const char *name, struct utimbuf *times) { - struct _utimbuf deftime; + struct utimbuf deftime; HANDLE fh; FILETIME mtime; FILETIME atime; |