mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Merge from gnulib and try to repair bad merge

Browse source 
This attempts to repair problems introduced by the bad merge
5491fd1098.  The easiest way for me
to fix the badly-merged gnulib files was to run
'admin/merge-gnulib', so I did that, which also imported the
following changes:
* build-aux/update-copyright, m4/gnulib.m4:
Update from gnulib, incorporating:
2015-01-15 time: port to MinGW32 3.21
2015-01-15 update-copyright: apply to self
2015-01-11 update-copyright: recognize groff's \(co marker
This commit is contained in:
Paul Eggert 2015-01-27 22:24:19 -08:00
parent 0cdd599c54
commit 39c2fa3f4e
79 changed files with 119 additions and 2336 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/time.in.h
View file

@ -55,6 +55,8 @@
# include <sys/time.h>
# elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
# include <pthread.h>
# elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
# include <unistd.h>
# else
# ifdef __cplusplus