From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 16 Nov 2016 23:24:41 +0000 (-0500)
Subject: Unbreak the build on Darwin (Bug#24957)
X-Git-Tag: emacs-26.0.90~1318
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf897a70b70d0f82708be52e1734aac8f68eaf12;p=emacs.git

Unbreak the build on Darwin (Bug#24957)

* src/fileio.c (file_name_case_insensitive_p) [DARWIN_OS]: Fix
mistakes in recent commit.
---

diff --git a/src/fileio.c b/src/fileio.c
index 70799eb2cd1..66a48733a6d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2282,7 +2282,7 @@ file_name_case_insensitive_p (const char *filename)
     {
       /* This is based on developer.apple.com's getattrlist man page.  */
       struct attrlist alist = {.volattr = ATTR_VOL_CAPABILITIES};
-      struct vol_capabilities_attr_t vcaps;
+      vol_capabilities_attr_t vcaps;
       if (getattrlist (filename, &alist, &vcaps, sizeof vcaps, 0) == 0)
 	{
 	  if (vcaps.valid[VOL_CAPABILITIES_FORMAT] & VOL_CAP_FMT_CASE_SENSITIVE)
@@ -2295,7 +2295,7 @@ file_name_case_insensitive_p (const char *filename)
       /* The following is based on
 	 http://lists.apple.com/archives/darwin-dev/2007/Apr/msg00010.html.  */
       struct attrlist alist;
-      unsigned char buffer[sizeof (vol_capabilities_attr_t)  sizeof (size_t)];
+      unsigned char buffer[sizeof (vol_capabilities_attr_t) + sizeof (size_t)];
 
       memset (&alist, 0, sizeof (alist));
       alist.volattr = ATTR_VOL_CAPABILITIES;