bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#24957: 26.0.50; DARWIN_OS_CASE_SENSITIVE_FIXME typos (PATCH)


From: Andrew Moore
Subject: bug#24957: 26.0.50; DARWIN_OS_CASE_SENSITIVE_FIXME typos (PATCH)
Date: Wed, 16 Nov 2016 17:29:12 -0500

Following commit 8b48e937af801e11e2d1844d60b6e585ce09dcea ("Simplify
case-insensitivity checks on Mac OS X"), Emacs fails to compile under darwin 
due to typos.
Here's a patch:

diff --git a/src/fileio.c b/src/fileio.c
index 70799eb..f741a78 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;
+      /* struct */ 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;


In GNU Emacs 26.0.50.3 (x86_64-apple-darwin15.6.0, NS appkit-1404.47 Version 
10.11.6 (Build 15G1108))
of 2016-11-16 built on vesta.slewsys.org
Repository revision: dc4b8a0c329a9d9e56e6be63cb4a0f59a952b07f
Windowing system distributor 'Apple', version 10.3.1404
Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.
/opt/src/programming/emacs/emacs
mwheel-scroll: End of buffer [4 times]
Compilation exited abnormally with code 2

Configured using:
'configure --prefix=/opt --with-ns CC=/usr/bin/clang
CXX=/usr/bin/clang++'

Configured features:
JPEG RSVG IMAGEMAGICK DBUS NOTIFY ACL GNUTLS LIBXML2 ZLIB
TOOLKIT_SCROLL_BARS NS

Important settings:
  value of $LC_ALL: en_US.UTF-8
  value of $LANG: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: Lisp Interaction

Minor modes in effect:
  shell-dirtrack-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Load-path shadows:
None found.

Features:
(shadow sort mail-extr emacsbug message subr-x puny seq byte-opt gv
bytecomp byte-compile cl-extra help-mode cconv cl-loaddefs pcase cl-lib
dired dired-loaddefs format-spec rfc822 mml easymenu mml-sec
password-cache epa derived epg epg-config gnus-util rmail rmail-loaddefs
mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils
mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr
mail-utils compile shell pcomplete comint ansi-color ring time-date
mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks
lisp-float-type mwheel term/ns-win ns-win ucs-normalize term/common-win
tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment
elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow timer
select scroll-bar mouse jit-lock font-lock syntax facemenu font-core
term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932
hebrew greek romanian slovak czech european ethiopic indian cyrillic
chinese charscript case-table epa-hook jka-cmpr-hook help simple abbrev
obarray minibuffer cl-preloaded nadvice loaddefs button faces cus-face
macroexp files text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget hashtable-print-readable backquote
dbusbind kqueue cocoa ns multi-tty make-network-process emacs)

Memory information:
((conses 16 215600 6717)
(symbols 48 20559 0)
(miscs 40 52 123)
(strings 32 20332 6483)
(string-bytes 1 663313)
(vectors 16 35782)
(vector-slots 8 676057 7085)
(floats 8 186 173)
(intervals 56 582 0)
(buffers 976 13))





reply via email to

[Prev in Thread] Current Thread [Next in Thread]