 @@ -1,74 +1,66 @@
-# $NetBSD: Makefile,v 1.115 2016/03/05 11:28:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.116 2016/04/13 13:52:27 hauke Exp $
 PKGNAME?=	${DISTNAME}
 COMMENT?=	XEmacs text editor version 21
-DISTNAME=	xemacs-21.4.23
+DISTNAME=	xemacs-21.4.24
-PKGREVISION=	3
+#PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 MAINTAINER=	hauke@NetBSD.org
 HOMEPAGE=	http://www.xemacs.org/
 LICENSE=	gnu-gpl-v2
 CONFLICTS+=	gnuserv-[0-9]*
 CONFLICTS+=	xemacs-[0-9]*
 CONFLICTS+=	xemacs-nox11-[0-9]*
 BROKEN_ON_PLATFORM=	*-*-mips*	# fails purespace dumping
 USE_TOOLS+=	makeinfo
 HAS_CONFIGURE=		yes
 DIST_SUBDIR=		xemacs
 PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
 FILES_SUBST+=		DISTNAME=${DISTNAME:Q}
 MESSAGE_SUBST+=		DISTNAME=${DISTNAME:Q}
 INFO_FILES=		yes
 .if defined(MANZ)
 PLIST_SUBST+=		ELSUFX='.gz'
 .else
 PLIST_SUBST+=		ELSUFX=''
 .endif
 .include "options.mk"
 CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}/man1
 CONFIGURE_ARGS+=	--infopath=${PREFIX}/${PKGINFODIR}
 CONFIGURE_ARGS+=	--with-clash-detection
 CONFIGURE_ARGS+=	--with-mule=yes
 CONFIGURE_ARGS+=	--with-msw=no
 CONFIGURE_ARGS+=	--pdump
 CFLAGS+=		-Dunix
 # Use terminfo on NetBSD-6 and newer.
 # We cannot use terminfo.*.mk as XEmacs enforces a link to termcap,
 # but this is fine for us.
 .if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
 CPPFLAGS+=	-DTERMINFO
 .endif
 .if ${X11_TYPE} != "modular"
 INFOPATH=		${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
 .else
 INFOPATH=		${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
 .endif
 CONFIGURE_ARGS+=	--infopath=${INFOPATH:Q}
 .if ${OPSYS} == "SunOS"
 .  if !exists(/usr/demo/SOUND/libaudio.a) && \
       !exists(/usr/demo/SOUND/lib/libaudio.a)
 CONFIGURE_ARGS+=	--with_sound=none
 .  endif
 .endif
 .if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
 CPPFLAGS+=		-DDFLY_CRT_USRLIB
 .endif
 CHECK_WRKREF_SKIP=	bin/xemacs*
 REPLACE_SH=		etc/check_cygwin_setup.sh

 @@ -1,25 +1,17 @@
-$NetBSD: distinfo,v 1.23 2016/03/29 19:32:53 hauke Exp $
+$NetBSD: distinfo,v 1.24 2016/04/13 13:52:27 hauke Exp $
-SHA1 (xemacs/xemacs-21.4.23.tar.gz) = b57bc569cf8d376c1e2443b6ea1f40d30271e9a6
+SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
-RMD160 (xemacs/xemacs-21.4.23.tar.gz) = 9df94c576b546a4df30c29ed3b5609ee816ad43c
+RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
-SHA512 (xemacs/xemacs-21.4.23.tar.gz) = 5f7b71c937ebcd7c16e42da8e0ac3d9619f8adc9e3b70707942285dd3a0b440d49c6f5ce929ec4a2b6f1093c7940354087221eac193233025b31b8b4b2ff2aee
+SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
-Size (xemacs/xemacs-21.4.23.tar.gz) = 8537366 bytes
+Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
-SHA1 (patch-Makefile.in.in) = ac8e41c0057a3c3aed0f02dc282423eb48158b7c
+SHA1 (patch-Makefile.in.in) = b09f11e040eccf66eb29a32fb69a6acca26f3356
-SHA1 (patch-configure) = a48c1a92098c67d6f3e87c0c0e9917bc545d5155
+SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
-SHA1 (patch-configure.in) = 6ae72ac1746b42fc7f9a451579a5288f53a2b21c
+SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e
-SHA1 (patch-lib-src_Makefile.in.in) = 865662811be6a92d5022f76e8325d0b194942791
+SHA1 (patch-man_lispref_debugging.texi) = 4d6f99c17bc8e25e700a663f7eff147b72fd9a14
-SHA1 (patch-lib-src_vcdiff) = bd42965219395cdae24d63972c23b3578229f375
+SHA1 (patch-man_lispref_intro.texi) = 5837f8a0e8057649921cdbddd8e8329165ec1104
-SHA1 (patch-lwlib_Makefile.in.in) = 2de9b7c45d7f5337d25138e518cd303b3c721fab
+SHA1 (patch-man_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59
-SHA1 (patch-man_custom.texi) = 516baec86e2d04facd94ce07e8cdd7390b1fcd79
+SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
-SHA1 (patch-man_info.texi) = eb40eb9b6392c558db8d831e02b7693aaadb83b9
+SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
-SHA1 (patch-man_lispref_edebug-inc.texi) = 8e0cb2c29886ca7eb0c9d18d750e1455fc0c0fae
+SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966
-SHA1 (patch-man_lispref_packaging.texi) = 8a778def392f5654122cc633177668b9c3d565fd
+SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305
-SHA1 (patch-man_term.texi) = 47aff3a7678d315e5ec24ddce1e2418ccb988ad4
+SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448
 SHA1 (patch-man_widget.texi) = 54076e3a3a14a2b26a9dc352a5359c6475d1f5c4
 SHA1 (patch-src_Makefile.in.in) = 28098f18870c34165b37fe11e84cbd6f5584bc63
 SHA1 (patch-src_config.h.in) = 9a031ace4ca6f89dacbf599484d9fcd410d7841f
 SHA1 (patch-src_dired.c) = 98f1c076c29385e3d5052cdb84d067f6cec8bc22
 SHA1 (patch-src_glyphs-eimage.c) = ea561758dd454003eb3274508087fd302d9d9fd4
 SHA1 (patch-src_lisp.h) = 60a0a77ffb67500e078e2cf53512350386741316
 SHA1 (patch-src_unexelf.c) = 738d09ea8a3d10b609e474b0efb8806d3e302bf9
 SHA1 (patch-src_unexfreebsd.c) = 89ce80b21fa5d6cf8be98762183c6a8b0d8f71dd

 @@ -1,147 +1,76 @@
-# $NetBSD: options.mk,v 1.11 2015/02/15 13:13:24 hauke Exp $
+# $NetBSD: options.mk,v 1.12 2016/04/13 13:52:27 hauke Exp $
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS=		ldap xface canna x11 debug
 PKG_OPTIONS_OPTIONAL_GROUPS=	toolkit
 PKG_OPTIONS_GROUP.toolkit=	lucid
 # GUI configuration is a mess... only support "lucid" for now.
 #PKG_OPTIONS_GROUP.toolkit+=	gtk motif xaw
 #PKG_OPTIONS_LEGACY_VARS+=	USE_ATHENA:xaw
 #PKG_OPTIONS_LEGACY_VARS+=	USE_GTK:gtk
 #PKG_OPTIONS_LEGACY_VARS+=	USE_MOTIF:motif
 PKG_SUGGESTED_OPTIONS=		x11
 .include "../../mk/bsd.options.mk"
 ###
-### Any of the "toolkit" options implies "x11".
+### Support drawing pretty X11 Lucid widgets
 ###
 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mlucid) || \
     !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw)
 .  if empty(PKG_OPTIONS:Mx11)
 PKG_OPTIONS+=		x11
 .  endif
 .endif
 ###
 ### Default to using the Lucid X11 toolkit if none is specified.
 ###
 .if !empty(PKG_OPTIONS:Mx11)
 .  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mlucid) && \
       empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
 PKG_OPTIONS+=		lucid
 .  endif
 .endif
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=	--with-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 .if !empty(PKG_OPTIONS:Mxface)
 CONFIGURE_ARGS+=	--with-xface
 .  include "../../mail/faces/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-xface
 .endif
 PLIST_VARS+=		canna
 .if !empty(PKG_OPTIONS:Mcanna)
 .  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-canna
 PLIST.canna=		yes
 .else
 CONFIGURE_ARGS+=	--without-canna
 .endif
 ###
 ### Support drawing pretty X11 widgets.
 ###
 PLIST_VARS+=		x11
 .if !empty(PKG_OPTIONS:Mx11)
 .  include "../../mk/jpeg.buildlink3.mk"
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"
 .  include "../../mk/xaw.buildlink3.mk"
 .  include "../../x11/xbitmaps/buildlink3.mk"
 PLIST.x11=		yes
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-jpeg
 CONFIGURE_ARGS+=	--with-png
 CONFIGURE_ARGS+=	--with-tiff
 CONFIGURE_ARGS+=	--with-xpm
 CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include:${X11BASE}/include
 CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib:${X11BASE}/lib
 CONFIGURE_ARGS+=	--site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
 # Lucid widgets
 CONFIGURE_ARGS+=	--with-toolbars=yes
 CONFIGURE_ARGS+=	--with-menubars=yes
 CONFIGURE_ARGS+=	--with-scrollbars=lucid
 CONFIGURE_ARGS+=	--with-dialogs=lucid
 CONFIGURE_ARGS+=	--with-widgets=lucid
 CONFIGURE_ARGS+=	--with-athena=xaw
 CONFIGURE_ARGS+=	--with-xim=xlib
 .else
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--without-jpeg
 CONFIGURE_ARGS+=	--without-png
 CONFIGURE_ARGS+=	--without-tiff
 CONFIGURE_ARGS+=	--without-xpm
 CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include
 CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib
 CONFIGURE_ARGS+=	--site-runtime-libraries=${PREFIX}/lib
 .endif
-###
+.if !empty(PKG_OPTIONS:Mldap)
-### Support using GTK X11 widgets.
+CONFIGURE_ARGS+=	--with-ldap
-###
+.  include "../../databases/openldap-client/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mgtk)
+.else
-.  include "../../x11/gtk/buildlink3.mk"
+CONFIGURE_ARGS+=	--without-ldap
 CONFIGURE_ARGS+=	--with-gtk
 CONFIGURE_ARGS+=	--with-menubars=yes
 CONFIGURE_ARGS+=	--with-scrollbars=yes
 CONFIGURE_ARGS+=	--with-dialogs=yes
 CONFIGURE_ARGS+=	--with-widgets=yes
 CONFIGURE_ARGS+=	--with-xim=yes
 .endif
 ###
 ### Support using Lucid X11 widgets.
 ###
 .if !empty(PKG_OPTIONS:Mlucid)
 .  include "../../mk/xaw.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-toolbars=yes
 CONFIGURE_ARGS+=	--with-menubars=yes
 CONFIGURE_ARGS+=	--with-scrollbars=lucid
 CONFIGURE_ARGS+=	--with-dialogs=lucid
 CONFIGURE_ARGS+=	--with-widgets=lucid
 CONFIGURE_ARGS+=	--with-athena=xaw
 CONFIGURE_ARGS+=	--with-xim=xlib
 .endif
-###
+.if !empty(PKG_OPTIONS:Mxface)
-### Support using Motif X11 widgets.
+CONFIGURE_ARGS+=	--with-xface
-###
+.  include "../../mail/faces/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mmotif)
+.else
-.  include "../../mk/motif.buildlink3.mk"
+CONFIGURE_ARGS+=	--without-xface
 CONFIGURE_ARGS+=	--with-menubars=motif
 CONFIGURE_ARGS+=	--with-scrollbars=motif
 CONFIGURE_ARGS+=	--with-dialogs=motif
 CONFIGURE_ARGS+=	--with-widgets=motif
 CONFIGURE_ARGS+=	--with-xim=motif
 .endif
-###
+PLIST_VARS+=		canna
-### Support using Athena X11 widgets.
+.if !empty(PKG_OPTIONS:Mcanna)
-###
+.  include "../../inputmethod/canna-lib/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mxaw)
+CONFIGURE_ARGS+=	--with-canna
-.  include "../../mk/xaw.buildlink3.mk"
+PLIST.canna=		yes
-CONFIGURE_ARGS+=	--with-menubars=athena
+.else
-CONFIGURE_ARGS+=	--with-scrollbars=athena
+CONFIGURE_ARGS+=	--without-canna
 CONFIGURE_ARGS+=	--with-dialogs=athena
 CONFIGURE_ARGS+=	--with-widgets=athena
 CONFIGURE_ARGS+=	--with-athena=xaw
 CONFIGURE_ARGS+=	--with-xim=xlib
 .endif
 PLIST_VARS+=            debug
 .if !empty(PKG_OPTIONS:Mdebug)
 CFLAGS+=                -g3
 INSTALL_UNSTRIPPED=     yes
 .endif

 @@ -1,14 +1,18 @@
-$NetBSD: patch-Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
 Avoid picking up local config when checking features
 Install {c,e}tags man pages with xemada prefix
 --- Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ Makefile.in.in
 @@ -407,7 +407,7 @@ lwlib/config.h: ${srcdir}/lwlib/config.h
  ## all.  --cet
  check-features: all
 -	${blddir}/src/${PROGNAME} -batch -l check-features.el
 +	${blddir}/src/${PROGNAME} -vanilla -batch -l check-features.el
  install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
 @@ -495,8 +495,10 @@ install-arch-indep: mkdir info

 @@ -1,14 +1,16 @@
-$NetBSD: patch-lib-src_Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-lib-src_Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
 Install selected files, using bsd.pkg.mk functionality
 --- lib-src/Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ lib-src/Makefile.in.in
 @@ -237,7 +237,7 @@ do-blessmail: $(blessmail)
  ## Install the internal utilities.  Until they are installed, we can
  ## just run them directly from lib-src.
 -${archlibdir}: all
 +install-archlibdir: all
  	@echo; echo "Installing utilities run internally by XEmacs."
  	./make-path ${archlibdir}
  	if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
 @@ -248,17 +248,23 @@ ${archlibdir}: all

 @@ -1,14 +1,16 @@
-$NetBSD: patch-lwlib_Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-lwlib_Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
 SunOS 5 bmake / gmake fixes
 --- lwlib/Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ lwlib/Makefile.in.in
 @@ -59,9 +59,9 @@ cflags = $(CFLAGS) $(cppflags)
  #ifdef SOLARIS2
  %.o : %.c
 -#else
 -.c.o:
 +	$(CC) -c $(cflags) $<
  #endif
 +.c.o:
  	$(CC) -c $(cflags) $<

 @@ -1,14 +1,23 @@
-$NetBSD: patch-src_Makefile.in.in,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_Makefile.in.in,v 1.2 2016/04/13 13:52:27 hauke Exp $
 Directly substitute the local value of etcdir (``../etc/'')
 into src/Makefile.in.in.  This allows for overriding etcdir via
 INSTALL_MAKE_FLAGS at install-time so that destdir-style installation
 will work.
 liboss support
 SunOS 5 bmake / gmake fixes
 --- src/Makefile.in.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/Makefile.in.in
 @@ -72,8 +72,8 @@ CPPFLAGS=@CPPFLAGS@
  LDFLAGS=@LDFLAGS@
  c_switch_all=@c_switch_all@
 -ld_switch_all=@ld_switch_all@
 -ld_libs_all=@ld_libs_all@
 +ld_switch_all=@ld_switch_all@ @LDFLAGS@
 +ld_libs_all=@ld_libs_all@ @LIBOSSAUDIO@
  ld_dynamic_link_flags=@ld_dynamic_link_flags@

 @@ -1,14 +1,16 @@
-$NetBSD: patch-src_unexelf.c,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_unexelf.c,v 1.2 2016/04/13 13:52:27 hauke Exp $
 Build on NetBSD/alpha
 --- src/unexelf.c.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/unexelf.c
 @@ -494,7 +494,7 @@ typedef struct {
  #  define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
  # endif
  # ifndef ELFSIZE
 -#  ifdef _LP64
 +#  if defined(_LP64) || defined(__alpha__)
  #   define ELFSIZE 64
  #  else
  #   define ELFSIZE 32
 @@ -970,7 +970,7 @@ unexec (char *new_name, char *old_name,

 @@ -1,13 +1,15 @@
-$NetBSD: patch-src_unexfreebsd.c,v 1.1 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_unexfreebsd.c,v 1.2 2016/04/13 13:52:27 hauke Exp $
 Build on NetBSD/arm*
 --- src/unexfreebsd.c.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/unexfreebsd.c
 @@ -289,7 +289,7 @@ copy_relocation_site (struct relocation_
    /* We can get relocation sites in the bss region, for objects whose
       contents are copied from a shared library.  We don't need or want
       to restore these at present. */
 -#ifndef sparc
 +#if !defined(sparc) && !defined(__arm__)
    if (ri->r_copy)
      return;
  #else

 @@ -1,13 +1,15 @@
-$NetBSD: patch-src_config.h.in,v 1.2 2015/02/04 09:19:20 hauke Exp $
+$NetBSD: patch-src_config.h.in,v 1.3 2016/04/13 13:52:27 hauke Exp $
 Always use static inline to fix build with C99 compilers.
 --- src/config.h.in.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/config.h.in
 @@ -853,7 +853,7 @@ on various systems. */
  /* Does the keyword `inline' exist?  */
  #undef inline
 -#if defined (__cplusplus) || ! defined (__GNUC__)
 +#if 1
  # define INLINE_HEADER inline static
  #elif defined (DONT_EXTERN_INLINE_HEADER_FUNCTIONS)
  # define INLINE_HEADER inline

 @@ -1,33 +1,22 @@
-$NetBSD: patch-src_lisp.h,v 1.4 2016/03/29 19:32:53 hauke Exp $
+$NetBSD: patch-src_lisp.h,v 1.5 2016/04/13 13:52:27 hauke Exp $
 Don't try to define max_align_t in C11 or C++11 mode.
 Fix CVE-2009-2688, via <https://bugzilla.redhat.com/show_bug.cgi?id=511994>
 --- src/lisp.h.orig	2015-01-29 15:04:29.000000000 +0000
 +++ src/lisp.h
 @@ -195,6 +195,7 @@ void xfree (void *);
  /* No type has a greater alignment requirement than max_align_t.
     (except perhaps for types we don't use, like long double) */
 +#if (__STDC_VERSION__ - 0) < 201112L && (__cplusplus - 0) < 201103L
  typedef union
+ {
    struct { long l; } l;
 @@ -202,6 +203,7 @@ typedef union
    struct { void (*f)(void); } f;
    struct { double d; } d;
  } max_align_t;
 +#endif
  #ifndef ALIGNOF
  # if defined (__GNUC__) && (__GNUC__ >= 2)
@@ -265,6 +267,8 @@ void assert_failed (const char *, int, c
  /*#define REGISTER register*/
  /*#endif*/
 +/* Mitigating CVE-2009-2688, see glyphs-eimage.c */
 +#define UINT_64_BIT uint64_t
  /* EMACS_INT is the underlying integral type into which a Lisp_Object must fit.
     In particular, it must be large enough to contain a pointer.