diff options
| author | Joakim Verona | 2015-02-01 00:37:46 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-02-01 00:37:46 +0100 |
| commit | 69815dfe3704f8a8c733843f1fd04546cbb0f4d0 (patch) | |
| tree | cee6910753a51b9a5ee88e2431c9bcad099e8ba8 /lib | |
| parent | 4edad429cafb2f0b1fda028be58367286ab04f1c (diff) | |
| parent | a2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e (diff) | |
| download | emacs-69815dfe3704f8a8c733843f1fd04546cbb0f4d0.tar.gz emacs-69815dfe3704f8a8c733843f1fd04546cbb0f4d0.zip | |
Merge branch 'master' into xwidget
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnulib.mk | 1 | ||||
| -rw-r--r-- | lib/time.in.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 07541ec93c8..1b671e7f6de 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk | |||
| @@ -1578,6 +1578,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( | |||
| 1578 | -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ | 1578 | -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ |
| 1579 | -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ | 1579 | -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ |
| 1580 | -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ | 1580 | -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ |
| 1581 | -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \ | ||
| 1581 | -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ | 1582 | -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ |
| 1582 | -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ | 1583 | -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ |
| 1583 | -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ | 1584 | -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ |
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 @@ | |||
| 55 | # include <sys/time.h> | 55 | # include <sys/time.h> |
| 56 | # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ | 56 | # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ |
| 57 | # include <pthread.h> | 57 | # include <pthread.h> |
| 58 | # elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ | ||
| 59 | # include <unistd.h> | ||
| 58 | # else | 60 | # else |
| 59 | 61 | ||
| 60 | # ifdef __cplusplus | 62 | # ifdef __cplusplus |