[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103849: Adapt MS-DOS build to change
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103849: Adapt MS-DOS build to changes to gnulib in trunk:103841-2. |
Date: |
Wed, 06 Apr 2011 20:52:21 +0300 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103849 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-04-06 20:52:21 +0300
message:
Adapt MS-DOS build to changes to gnulib in trunk:103841-2.
msdos/sedlibmk.inp: Update checklist.
(am_libgnu_a_OBJECTS): Remove careadlinkat.$(OBJEXT).
($(top_builddir)/config.status): Edit away, both as target and in
prerequisites.
(@am__fastdepCC_FALSE@): Fix editing.
(@GL_GENERATE_STDBOOL_H_TRUE@, @GL_GENERATE_STDBOOL_H_FALSE@)
(@GL_GENERATE_STDDEF_H_TRUE@, @GL_GENERATE_STDDEF_H_FALSE@)
(@GL_GENERATE_STDINT_H_TRUE@, @GL_GENERATE_STDINT_H_FALSE@): Edit
to either nothing or "#".
src/msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements.
modified:
msdos/ChangeLog
msdos/sedlibmk.inp
src/ChangeLog
src/msdos.c
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2011-04-06 12:18:10 +0000
+++ b/msdos/ChangeLog 2011-04-06 17:49:21 +0000
@@ -1,3 +1,15 @@
+2011-04-06 Eli Zaretskii <address@hidden>
+
+ * sedlibmk.inp: Update checklist.
+ (am_libgnu_a_OBJECTS): Remove careadlinkat.$(OBJEXT).
+ ($(top_builddir)/config.status): Edit away, both as target and in
+ prerequisites.
+ (@am__fastdepCC_FALSE@): Fix editing.
+ (@GL_GENERATE_STDBOOL_H_TRUE@, @GL_GENERATE_STDBOOL_H_FALSE@)
+ (@GL_GENERATE_STDDEF_H_TRUE@, @GL_GENERATE_STDDEF_H_FALSE@)
+ (@GL_GENERATE_STDINT_H_TRUE@, @GL_GENERATE_STDINT_H_FALSE@): Edit
+ to either nothing or "#".
+
2011-03-25 Eli Zaretskii <address@hidden>
* sedlibmk.inp: Adapt to addition of the gnulib stdio module.
=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp 2011-03-25 12:52:03 +0000
+++ b/msdos/sedlibmk.inp 2011-04-06 17:49:21 +0000
@@ -35,6 +35,16 @@
# /^STDINT_H *=/s/@address@hidden@/stdint.h/ -- stdint.h is needed
# /^STDDEF_H *=/s/@address@hidden@// -- stddef.h is not needed
#
+# . Some of the headers are generated conditionally, and the
+# corresponding recipes are guarder by @GL_GENERATE_xxxx_H_TRUE@
+# and @address@hidden Depending on whether DJGPP uses
+# the corresponding header, these should be edited either to
+# nothing (thus exposing the recipe) or to #, which comments the
+# recipe away. Example:
+#
+# s/address@hidden@/\#/
+# s/address@hidden@//
+#
# . Also edit the NEXT_foo and NEXT_AS_FIRST_DIRECTIVE_foo_H variable
# as appropriately: to an empty value if the gnulib header is not
# used, and to the corresponding DJGPP header name otherwise.
@@ -490,6 +500,7 @@
/^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/
/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
/^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o
getloadavg.o md5.o filemode.o/
+/^am_libgnu_a_OBJECTS *=/s/careadlinkat.\$(OBJEXT)//
/^srcdir *=/s/@address@hidden@/./
/^top_srcdir *=/s/@address@hidden@/../
/^top_builddir *=/s/@address@hidden@/../
@@ -500,6 +511,10 @@
/^\$(srcdir)\/Makefile\.in:/,/^[ ][ ]*\$(AUTOMAKE)/d
/^Makefile:/,/^[ ][ ]*esac/d
/^\$(top_srcdir)\/configure:/,/^\$(ACLOCAL_M4)/d
+/^\$(top_builddir)\/config.status:/,/^$/d
+#
+# Remove the dependencies on $(top_builddir)/config.status
+s/ $(top_builddir)\/config.status//
#
# Fix the include-dependency lines
s/address@hidden@//
@@ -507,7 +522,7 @@
s/@am__include@/include/
s/@am__quote@//g
s/address@hidden@//
-s/address@hidden/\#/
+s/address@hidden@/\#/
#
# Fix the *-clean rules, to not use a Unixy `test' command. Empty
# lists are replaced with a dummy file, to avoid an error message from
@@ -520,6 +535,12 @@
s/@echo /@djecho/
#
# Fix the recipes for header files
+s/address@hidden@/\#/
+s/address@hidden@//
+s/address@hidden@/\#/
+s/address@hidden@//
+s/address@hidden@//
+s/address@hidden@/\#/
/^arg-nonnull\.h:/,/^[ ][ ]*mv /c\
arg-nonnull.h: $(top_srcdir)/./arg-nonnull.h\
sed -n -e '/GL_ARG_NONNULL/,$$p' < $(top_srcdir)/./arg-nonnull.h > $@
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-04-06 16:05:49 +0000
+++ b/src/ChangeLog 2011-04-06 17:49:21 +0000
@@ -1,5 +1,7 @@
2011-04-06 Eli Zaretskii <address@hidden>
+ * msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements.
+
* w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
2011-04-06 Paul Eggert <address@hidden>
=== modified file 'src/msdos.c'
--- a/src/msdos.c 2011-03-12 10:51:31 +0000
+++ b/src/msdos.c 2011-04-06 17:49:21 +0000
@@ -81,6 +81,9 @@
#include <signal.h>
#include "syssignal.h"
+#include "careadlinkat.h"
+#include "allocator.h"
+
#ifndef SYSTEM_MALLOC
#ifdef GNU_MALLOC
@@ -3933,6 +3936,41 @@
}
#endif
+char *
+careadlinkat (int fd, char const *filename,
+ char *buffer, size_t buffer_size,
+ struct allocator const *alloc,
+ ssize_t (*preadlinkat) (int, char const *, char *, size_t))
+{
+ if (!buffer)
+ {
+ /* We don't support the fancy auto-allocation feature. */
+ if (!buffer_size)
+ errno = ENOSYS;
+ else
+ errno = EINVAL;
+ buffer = NULL;
+ }
+ else
+ {
+ ssize_t len = preadlinkat (fd, filename, buffer, buffer_size);
+
+ if (len < 0 || len == buffer_size)
+ buffer = NULL;
+ else
+ buffer[len + 1] = '\0';
+ }
+ return buffer;
+}
+
+ssize_t
+careadlinkatcwd (int fd, char const *filename, char *buffer,
+ size_t buffer_size)
+{
+ (void) fd;
+ return readlink (filename, buffer, buffer_size);
+}
+
#if __DJGPP__ == 2 && __DJGPP_MINOR__ < 2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103849: Adapt MS-DOS build to changes to gnulib in trunk:103841-2.,
Eli Zaretskii <=