From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chad Brown Newsgroups: gmane.emacs.devel Subject: Re: recent commit broke src/dired.c on OSX Date: Sun, 25 Jul 2010 19:46:13 -0700 Message-ID: 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 (Apple Message framework v1081) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1280112389 18998 80.91.229.12 (26 Jul 2010 02:46:29 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 26 Jul 2010 02:46:29 +0000 (UTC) Cc: emacs-devel@gnu.org, "Randal L. Schwartz" To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jul 26 04:46:27 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 1OdDhy-00052k-Ot for ged-emacs-devel@m.gmane.org; Mon, 26 Jul 2010 04:46:27 +0200 Original-Received: from localhost ([127.0.0.1]:52906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdDhy-00026v-8r for ged-emacs-devel@m.gmane.org; Sun, 25 Jul 2010 22:46:26 -0400 Original-Received: from [140.186.70.92] (port=39013 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdDhs-00025V-44 for emacs-devel@gnu.org; Sun, 25 Jul 2010 22:46:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdDhq-0007aG-OE for emacs-devel@gnu.org; Sun, 25 Jul 2010 22:46:20 -0400 Original-Received: from dmz-mailsec-scanner-7.mit.edu ([18.7.68.36]:48378) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdDhq-0007a8-Jh for emacs-devel@gnu.org; Sun, 25 Jul 2010 22:46:18 -0400 X-AuditID: 12074424-b7c35ae000000a07-7e-4c4cf6fcf365 Original-Received: from mailhub-auth-2.mit.edu (MAILHUB-AUTH-2.MIT.EDU [18.7.62.36]) by dmz-mailsec-scanner-7.mit.edu (Symantec Brightmail Gateway) with SMTP id 3F.01.02567.CF6FC4C4; Sun, 25 Jul 2010 22:46:20 -0400 (EDT) Original-Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id o6Q2kHir003913; Sun, 25 Jul 2010 22:46:17 -0400 Original-Received: from [10.0.0.41] ([64.241.37.140]) (authenticated bits=0) (User authenticated as yandros@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id o6Q2kEuC011373 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Sun, 25 Jul 2010 22:46:16 -0400 (EDT) In-Reply-To: X-Mailer: Apple Mail (2.1081) X-Brightmail-Tracker: AAAAAA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:127811 Archived-At: Jan seems to be correct, that it's simply an issue of detecting dirent.h = (instead of guessing via SYSV_SYSTEM_DIR). In the meantime, the = following trivial patch fixes the problem on OSX. =3D=3D=3D modified file 'src/dired.c' *** src/dired.c 2010-07-25 00:20:51 +0000 --- src/dired.c 2010-07-26 02:21:58 +0000 *************** *** 48,59 **** Since applying strlen to the name always works, we'll just do that. = */ #define NAMLEN(p) strlen (p->d_name) =20 ! #ifdef SYSV_SYSTEM_DIR =20 #include #define DIRENTRY struct dirent =20 ! #else /* not SYSV_SYSTEM_DIR */ =20 #ifdef MSDOS #include --- 48,59 ---- Since applying strlen to the name always works, we'll just do that. = */ #define NAMLEN(p) strlen (p->d_name) =20 ! #if defined(SYSV_SYSTEM_DIR) || defined(DARWIN_OS) =20 #include #define DIRENTRY struct dirent =20 ! #else /* not (SYSV_SYSTEM_DIR || DARWIN_OS) */ =20 #ifdef MSDOS #include