[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111209: nt/config.nt: Sync with auto
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111209: nt/config.nt: Sync with autogen/config.in. |
Date: |
Thu, 13 Dec 2012 02:18:28 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111209
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-13 02:18:28 +0100
message:
nt/config.nt: Sync with autogen/config.in.
(HAVE_INOTIFY, HAVE_SYS_INOTIFY_H): New macros.
modified:
nt/ChangeLog
nt/config.nt
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-12-11 01:35:28 +0000
+++ b/nt/ChangeLog 2012-12-13 01:18:28 +0000
@@ -1,3 +1,8 @@
+2012-12-13 Juanma Barranquero <address@hidden>
+
+ * config.nt: Sync with autogen/config.in.
+ (HAVE_INOTIFY, HAVE_SYS_INOTIFY_H): New macros.
+
2012-12-11 Juanma Barranquero <address@hidden>
* config.nt: Sync with autogen/config.in.
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2012-12-11 01:35:28 +0000
+++ b/nt/config.nt 2012-12-13 01:18:28 +0000
@@ -524,6 +524,9 @@
/* Define to 1 if you have inet sockets. */
#define HAVE_INET_SOCKETS 1
+/* Define to 1 to use inotify. */
+#undef HAVE_INOTIFY
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -920,6 +923,9 @@
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
+/* Define to 1 if you have the <sys/inotify.h> header file. */
+#undef HAVE_SYS_INOTIFY_H
+
/* Define to 1 if you have the <sys/inttypes.h> header file. */
#undef HAVE_SYS_INTTYPES_H
@@ -1536,13 +1542,19 @@
when FOO is an inline function in the header; see
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.
_GL_INLINE_HEADER_END contains useful stuff to put
- in the same include file, after uses of _GL_INLINE. */
-#if (__GNUC__ \
- ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
- : 199901L <= __STDC_VERSION__)
+ in the same include file, after uses of _GL_INLINE.
+
+ Suppress the use of extern inline on Apple's platforms,
+ as Libc-825.25 (2012-09-19) is incompatible with it; see
+ <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+ Perhaps Apple will fix this some day. */
+#if ((__GNUC__ \
+ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+ : 199901L <= __STDC_VERSION__) \
+ && !defined __APPLE__)
# define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
# if __GNUC_GNU_INLINE__
/* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
@@ -1551,8 +1563,8 @@
# endif
# define _GL_EXTERN_INLINE extern
#else
-# define _GL_INLINE static
-# define _GL_EXTERN_INLINE static
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
#endif
#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111209: nt/config.nt: Sync with autogen/config.in.,
Juanma Barranquero <=