bug#14812: 24.3; build failure on FreeBSD 9.1

[ashish.is@lostca.se (Ashish SHUKLA)]

[-- Attachment #1.1: Type: text/plain, Size: 427 bytes --]

Hi,

I'm the maintainer of editors/emacs* FreeBSD ports, and I'd couple of patches
which are present in FreeBSD ports tree[1]. For this problem, I'm attaching
the patches.

References:
[1]  http://svnweb.freebsd.org/ports/head/editors/emacs-devel/files/

Thanks
-- 
Ashish SHUKLA

“Maxwell's equations have had a greater impact on human history than any ten
presidents.” ("Carl Sagan")

Sent from my Emacs

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: patch-src_lisp.h --]
[-- Type: text/x-chdr, Size: 255 bytes --]


$FreeBSD$

--- src/lisp.h.orig
+++ src/lisp.h
@@ -21,6 +21,10 @@
 #define EMACS_LISP_H
 
 #include <setjmp.h>
+#ifdef __FreeBSD__
+#undef _Alignof
+#undef _Alignas
+#endif
 #include <stdalign.h>
 #include <stdarg.h>
 #include <stdbool.h>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: patch-lib_verify.h --]
[-- Type: text/x-chdr, Size: 449 bytes --]


$FreeBSD$

--- lib/verify.h.orig
+++ lib/verify.h
@@ -21,6 +21,11 @@
 # define _GL_VERIFY_H
 
 
+// undefine the _Static_assert definition present in <sys/cdefs.h>
+#ifdef __FreeBSD__
+#undef _Static_assert
+#endif
+
 /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
    This is supported by GCC 4.6.0 and later, in C mode, and its use
    here generates easier-to-read diagnostics when verify (R) fails.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]