diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-27 22:24:19 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-27 22:24:47 -0800 |
| commit | 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4 (patch) | |
| tree | e3331217ed3d9fab50de7d92fa1f2074138ac407 /lib/time.in.h | |
| parent | 0cdd599c54aeda36e7e0696b2f90d2c286153a1d (diff) | |
| download | emacs-39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4.tar.gz | |
Merge from gnulib and try to repair bad merge
This attempts to repair problems introduced by the bad merge
5491fd1098d27b3ba3db054076b9ab60fb3558dc. 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
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index 8d721c5ab84..1a6b746ccab 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -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 |