Commit 368a85a4 authored by Paul Eggert's avatar Paul Eggert

* sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame

when including <sys/user.h>, to prevent Sparc/ARM machine/frame.h
from messing up Emacs's 'struct frame'.

Fixes: debbugs:14923
parent 6874724a
2013-07-22 Paul Eggert <eggert@cs.ucla.edu>
* sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame
when including <sys/user.h>, to prevent Sparc/ARM machine/frame.h
from messing up Emacs's 'struct frame' (Bug#14923).
2013-07-21 Paul Eggert <eggert@cs.ucla.edu>
* alloc.c (make_save_ptr_ptr): Define this function.
......
......@@ -42,9 +42,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#ifdef __FreeBSD__
#include <sys/user.h>
#include <sys/resource.h>
#include <math.h>
/* Sparc/ARM machine/frame.h has 'struct frame' which conflicts with Emacs's
'struct frame', so rename it. */
# define frame freebsd_frame
# include <sys/user.h>
# undef frame
# include <sys/resource.h>
# include <math.h>
#endif
#ifdef WINDOWSNT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment