From: Paul Eggert Date: Mon, 22 Jul 2013 15:30:54 +0000 (+0100) Subject: * sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1737 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=368a85a4dbc324c90b2f3338fc97cc73b4c53222;p=emacs.git * sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame when including , to prevent Sparc/ARM machine/frame.h from messing up Emacs's 'struct frame'. Fixes: debbugs:14923 --- diff --git a/src/ChangeLog b/src/ChangeLog index d3c5ffaff58..1ad809dffab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-07-22 Paul Eggert + + * sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame + when including , to prevent Sparc/ARM machine/frame.h + from messing up Emacs's 'struct frame' (Bug#14923). + 2013-07-21 Paul Eggert * alloc.c (make_save_ptr_ptr): Define this function. diff --git a/src/sysdep.c b/src/sysdep.c index 2739583456a..11a6f4a76ce 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -42,9 +42,14 @@ along with GNU Emacs. If not, see . */ #endif #ifdef __FreeBSD__ -#include -#include -#include +/* Sparc/ARM machine/frame.h has 'struct frame' which conflicts with Emacs's + 'struct frame', so rename it. */ +# define frame freebsd_frame +# include +# undef frame + +# include +# include #endif #ifdef WINDOWSNT