[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: recent commit broke src/dired.c on OSX
From: |
David Kastrup |
Subject: |
Re: recent commit broke src/dired.c on OSX |
Date: |
Mon, 26 Jul 2010 10:44:35 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
Juanma Barranquero <address@hidden> writes:
> On Mon, Jul 26, 2010 at 05:12, Chad Brown <address@hidden> wrote:
>
>> P.S. If someone would prefer unidiffs instead, just let me know.
>
> Yes, please..
Uh, save as /tmp/junk.patch, load it into Emacs, type C-c C-u and you
have unidiff like the following:
=== modified file 'configure'
--- configure 2010-07-25 19:09:54 +0000
+++ configure 2010-07-26 02:39:53 +0000
@@ -6149,7 +6149,7 @@
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
- sys/utsname.h pwd.h utmp.h
+ sys/utsname.h pwd.h utmp.h dirent.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header"
"$ac_includes_default"
=== modified file 'configure.in'
--- configure.in 2010-07-25 19:09:54 +0000
+++ configure.in 2010-07-26 02:36:43 +0000
@@ -1204,7 +1204,7 @@
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
- sys/utsname.h pwd.h utmp.h)
+ sys/utsname.h pwd.h utmp.h dirent.h)
AC_MSG_CHECKING(if personality LINUX32 can be set)
AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
=== modified file 'src/config.in'
--- src/config.in 2010-07-25 19:09:54 +0000
+++ src/config.in 2010-07-26 02:43:53 +0000
@@ -737,6 +737,9 @@
/* Define to 1 if you have the <utmp.h> header file. */
#undef HAVE_UTMP_H
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
/* Define to 1 if you have the `vfork' function. */
#undef HAVE_VFORK
=== modified file 'src/dired.c'
--- src/dired.c 2010-07-25 00:20:51 +0000
+++ src/dired.c 2010-07-26 03:03:56 +0000
@@ -48,29 +48,22 @@
Since applying strlen to the name always works, we'll just do that. */
#define NAMLEN(p) strlen (p->d_name)
-#ifdef SYSV_SYSTEM_DIR
+#ifdef HAVE_DIRENT_H
#include <dirent.h>
#define DIRENTRY struct dirent
-#else /* not SYSV_SYSTEM_DIR */
+#else /* not HAVE_DIRENT */
-#ifdef MSDOS
-#include <dirent.h>
-#else
#include <sys/dir.h>
-#endif
-
#include <sys/stat.h>
-#ifndef MSDOS
#define DIRENTRY struct direct
extern DIR *opendir (char *);
extern struct direct *readdir (DIR *);
-#endif /* not MSDOS */
-#endif /* not SYSV_SYSTEM_DIR */
+#endif /* HAVE_DIRENT_H */
/* Some versions of Cygwin don't have d_ino in `struct dirent'. */
#if defined(MSDOS) || defined(__CYGWIN__)
=== modified file 'src/sysdep.c'
--- src/sysdep.c 2010-07-13 10:57:00 +0000
+++ src/sysdep.c 2010-07-26 02:48:50 +0000
@@ -2447,7 +2447,7 @@
/* Directory routines for systems that don't have them. */
-#ifdef SYSV_SYSTEM_DIR
+#ifdef HAVE_DIRENT
#include <dirent.h>
@@ -2464,7 +2464,7 @@
return rtnval;
}
#endif /* not HAVE_CLOSEDIR */
-#endif /* SYSV_SYSTEM_DIR */
+#endif /* HAVE_DIRENT */
int
--
David Kastrup
- Re: recent commit broke src/dired.c on OSX, (continued)
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Randal L. Schwartz, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Randal L. Schwartz, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Chad Brown, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Chad Brown, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Chad Brown, 2010/07/25
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/25
- Re: recent commit broke src/dired.c on OSX,
David Kastrup <=
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/26
- Re: recent commit broke src/dired.c on OSX, Jan Djärv, 2010/07/26
- Re: recent commit broke src/dired.c on OSX, Jan Djärv, 2010/07/26
- Re: recent commit broke src/dired.c on OSX, Eli Zaretskii, 2010/07/26
- Re: recent commit broke src/dired.c on OSX, Chad Brown, 2010/07/27
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/27
- Re: recent commit broke src/dired.c on OSX, Óscar Fuentes, 2010/07/27
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/27
- Re: recent commit broke src/dired.c on OSX, Óscar Fuentes, 2010/07/27
- Re: recent commit broke src/dired.c on OSX, Juanma Barranquero, 2010/07/27