diff options
| author | joerg <joerg@pkgsrc.org> | 2016-03-26 23:26:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-03-26 23:26:14 +0000 |
| commit | fbb9029333c7a505d3f13410c5ed94a4c2174cc0 (patch) | |
| tree | 8ad7c71c22291509a0f6d23dcade2348cac3f04e /editors/xemacs | |
| parent | 981a2c080002f04bc18293c6706dedabf856970a (diff) | |
| download | pkgsrc-fbb9029333c7a505d3f13410c5ed94a4c2174cc0.tar.gz | |
Don't try to define max_align_t in C11 or C++11 mode.
Diffstat (limited to 'editors/xemacs')
| -rw-r--r-- | editors/xemacs/distinfo | 4 | ||||
| -rw-r--r-- | editors/xemacs/patches/patch-src_lisp.h | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index 67bf8157eaf..ca02c20458b 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/01/17 07:51:34 richard Exp $ +$NetBSD: distinfo,v 1.22 2016/03/26 23:26:14 joerg Exp $ SHA1 (xemacs/xemacs-21.4.23.tar.gz) = b57bc569cf8d376c1e2443b6ea1f40d30271e9a6 RMD160 (xemacs/xemacs-21.4.23.tar.gz) = 9df94c576b546a4df30c29ed3b5609ee816ad43c @@ -20,6 +20,6 @@ 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) = 92f866c17745a3bf664c3c1153249f15fffb1866 +SHA1 (patch-src_lisp.h) = eb3247faef98f889cd6c95584395f97b1d29e2f7 SHA1 (patch-src_unexelf.c) = 738d09ea8a3d10b609e474b0efb8806d3e302bf9 SHA1 (patch-src_unexfreebsd.c) = 89ce80b21fa5d6cf8be98762183c6a8b0d8f71dd diff --git a/editors/xemacs/patches/patch-src_lisp.h b/editors/xemacs/patches/patch-src_lisp.h index 63e04f31d6a..c65f23ff525 100644 --- a/editors/xemacs/patches/patch-src_lisp.h +++ b/editors/xemacs/patches/patch-src_lisp.h @@ -1,16 +1,20 @@ -$NetBSD: patch-src_lisp.h,v 1.2 2015/02/04 09:19:20 hauke Exp $ +$NetBSD: patch-src_lisp.h,v 1.3 2016/03/26 23:26:14 joerg Exp $ ---- src/lisp.h.orig 2015-01-29 15:04:29.000000000 +0000 +--- src/lisp.h.orig 2016-03-26 15:03:47.482901440 +0000 +++ src/lisp.h -@@ -265,6 +265,11 @@ void assert_failed (const char *, int, c - /*#define REGISTER register*/ - /*#endif*/ +@@ -195,6 +195,7 @@ void xfree (void *); -+#if SIZEOF_LONG == 8 -+#define UINT_64_BIT unsigned long -+#elif SIZEOF_LONG_LONG == 8 -+#define UINT_64_BIT unsigned long long + /* 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 - /* 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. + #ifndef ALIGNOF + # if defined (__GNUC__) && (__GNUC__ >= 2) |