[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104518: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104518: Merge from gnulib. |
Date: |
Mon, 06 Jun 2011 12:53:44 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104518
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2011-06-06 12:53:44 -0700
message:
Merge from gnulib.
* lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.
modified:
ChangeLog
lib/careadlinkat.c
lib/careadlinkat.h
m4/gnulib-common.m4
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-06-02 08:40:41 +0000
+++ b/ChangeLog 2011-06-06 19:53:44 +0000
@@ -1,3 +1,8 @@
+2011-06-06 Paul Eggert <address@hidden>
+
+ Merge from gnulib.
+ * lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.
+
2011-06-02 Paul Eggert <address@hidden>
* lib/allocator.h, lib/careadlinkat.c: Merge from gnulib.
=== modified file 'lib/careadlinkat.c'
--- a/lib/careadlinkat.c 2011-06-02 08:25:28 +0000
+++ b/lib/careadlinkat.c 2011-06-06 19:53:44 +0000
@@ -39,7 +39,6 @@
#include "allocator.h"
-#if ! HAVE_READLINKAT
/* Get the symbolic link value of FILENAME and put it into BUFFER, with
size BUFFER_SIZE. This function acts like readlink but has
readlinkat's signature. */
@@ -53,7 +52,6 @@
abort ();
return readlink (filename, buffer, buffer_size);
}
-#endif
/* Assuming the current directory is FD, get the symbolic link value
of FILENAME as a null-terminated string and put it into a buffer.
=== modified file 'lib/careadlinkat.h'
--- a/lib/careadlinkat.h 2011-04-09 18:44:05 +0000
+++ b/lib/careadlinkat.h 2011-06-06 19:53:44 +0000
@@ -56,8 +56,7 @@
when doing a plain readlink:
Pass FD = AT_FDCWD and PREADLINKAT = careadlinkatcwd. */
#if HAVE_READLINKAT
-/* AT_FDCWD is declared in <fcntl.h>, readlinkat in <unistd.h>. */
-# define careadlinkatcwd readlinkat
+/* AT_FDCWD is declared in <fcntl.h>. */
#else
/* Define AT_FDCWD independently, so that the careadlinkat module does
not depend on the fcntl-h module. The value does not matter, since
@@ -66,8 +65,8 @@
# ifndef AT_FDCWD
# define AT_FDCWD (-3041965)
# endif
+#endif
ssize_t careadlinkatcwd (int fd, char const *filename,
char *buffer, size_t buffer_size);
-#endif
#endif /* _GL_CAREADLINKAT_H */
=== modified file 'm4/gnulib-common.m4'
--- a/m4/gnulib-common.m4 2011-04-01 06:07:33 +0000
+++ b/m4/gnulib-common.m4 2011-06-06 19:53:44 +0000
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 24
+# gnulib-common.m4 serial 25
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -34,6 +34,20 @@
/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
is a misnomer outside of parameter lists. */
#define _UNUSED_PARAMETER_ _GL_UNUSED
+
+/* The __pure__ attribute was added in gcc 2.96. */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+#else
+# define _GL_ATTRIBUTE_PURE /* empty */
+#endif
+
+/* The __const__ attribute was added in gcc 2.95. */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
+#else
+# define _GL_ATTRIBUTE_CONST /* empty */
+#endif
])
dnl Preparation for running test programs:
dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104518: Merge from gnulib.,
Paul Eggert <=