[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112122: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112122: Merge from gnulib. |
Date: |
Sat, 23 Mar 2013 17:49:50 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112122
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-23 17:49:50 -0700
message:
Merge from gnulib.
modified:
ChangeLog
lib/sys_select.in.h
lib/sys_time.in.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-18 21:02:34 +0000
+++ b/ChangeLog 2013-03-24 00:49:50 +0000
@@ -1,3 +1,8 @@
+2013-03-24 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2013-03-21 sys_select, sys_time: port 2013-01-30 fix to Cygwin
+
2013-03-18 Paul Eggert <address@hidden>
Fix bug when building Emacs with a GNU Make submake (Bug#13962).
=== modified file 'lib/sys_select.in.h'
--- a/lib/sys_select.in.h 2013-02-08 23:37:17 +0000
+++ b/lib/sys_select.in.h 2013-03-24 00:49:50 +0000
@@ -21,23 +21,27 @@
/* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h>
both include <sys/select.h>.
+ On Cygwin, <sys/time.h> includes <sys/select.h>.
Simply delegate to the system's header in this case. */
#if (@HAVE_SYS_SELECT_H@ \
- && ((defined __osf__ && defined _SYS_TYPES_H_ && defined _OSF_SOURCE) \
+ && ((defined __osf__ && defined _SYS_TYPES_H_ \
+ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
+ && defined _OSF_SOURCE) \
|| (defined __sun && defined _SYS_TYPES_H \
&& (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
- || defined __EXTENSIONS__))) \
- && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H)
+ || defined __EXTENSIONS__))))
# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
#elif (@HAVE_SYS_SELECT_H@ \
- && ((defined __osf__ && defined _SYS_TIME_H_ && defined _OSF_SOURCE) \
+ && (defined _CYGWIN_SYS_TIME_H \
+ || (defined __osf__ && defined _SYS_TIME_H_ \
+ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
+ && defined _OSF_SOURCE) \
|| (defined __sun && defined _SYS_TIME_H \
&& (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
- || defined __EXTENSIONS__))) \
- && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H)
+ || defined __EXTENSIONS__))))
# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
=== modified file 'lib/sys_time.in.h'
--- a/lib/sys_time.in.h 2013-02-08 23:37:17 +0000
+++ b/lib/sys_time.in.h 2013-03-24 00:49:50 +0000
@@ -24,6 +24,14 @@
#endif
@PRAGMA_COLUMNS@
+/* On Cygwin, <sys/time.h> includes itself recursively via <sys/select.h>.
+ Simply delegate to the system's header in this case; it is a no-op.
+ Without this extra ifdef, the C++ gettimeofday declaration below
+ would be a forward declaration in gnulib's nested <sys/time.h>. */
+#ifdef _CYGWIN_SYS_TIME_H
+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
+#else
+
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SYS_TIME_H@
# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
@@ -200,4 +208,5 @@
#endif
#endif /* address@hidden@_SYS_TIME_H */
+#endif /* _CYGWIN_SYS_TIME_H */
#endif /* address@hidden@_SYS_TIME_H */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112122: Merge from gnulib.,
Paul Eggert <=