From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: recent commit broke src/dired.c on OSX Date: Mon, 26 Jul 2010 10:44:35 +0200 Organization: Organization?!? Message-ID: <87bp9uljik.fsf@lola.goethe.zz> References: <86iq4379w0.fsf@red.stonehenge.com> <86eier7942.fsf@red.stonehenge.com> <86aapf78af.fsf@red.stonehenge.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: dough.gmane.org 1280133907 4835 80.91.229.12 (26 Jul 2010 08:45:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 26 Jul 2010 08:45:07 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jul 26 10:45:06 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OdJJ2-00048S-Rr for ged-emacs-devel@m.gmane.org; Mon, 26 Jul 2010 10:45:05 +0200 Original-Received: from localhost ([127.0.0.1]:33003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdJJ2-0003HY-DT for ged-emacs-devel@m.gmane.org; Mon, 26 Jul 2010 04:45:04 -0400 Original-Received: from [140.186.70.92] (port=33917 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdJIr-0003HQ-8J for emacs-devel@gnu.org; Mon, 26 Jul 2010 04:44:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdJIm-000673-1K for emacs-devel@gnu.org; Mon, 26 Jul 2010 04:44:53 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:50691) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdJIl-00066S-L8 for emacs-devel@gnu.org; Mon, 26 Jul 2010 04:44:48 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OdJIh-0003wg-Js for emacs-devel@gnu.org; Mon, 26 Jul 2010 10:44:43 +0200 Original-Received: from p508ece30.dip.t-dialin.net ([80.142.206.48]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 26 Jul 2010 10:44:43 +0200 Original-Received: from dak by p508ece30.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 26 Jul 2010 10:44:43 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 130 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: p508ece30.dip.t-dialin.net X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:YiyBD2cWPokQ5CtA6l41QhRA1vQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:127825 Archived-At: --=-=-= Juanma Barranquero writes: > On Mon, Jul 26, 2010 at 05:12, Chad Brown 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: --=-=-= Content-Type: text/x-patch Content-Disposition: inline === 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 ], [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 header file. */ #undef HAVE_UTMP_H +/* Define to 1 if you have the 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 #define DIRENTRY struct dirent -#else /* not SYSV_SYSTEM_DIR */ +#else /* not HAVE_DIRENT */ -#ifdef MSDOS -#include -#else #include -#endif - #include -#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 @@ -2464,7 +2464,7 @@ return rtnval; } #endif /* not HAVE_CLOSEDIR */ -#endif /* SYSV_SYSTEM_DIR */ +#endif /* HAVE_DIRENT */ int --=-=-= -- David Kastrup --=-=-=--