procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Fixes: debbugs:14923
This commit is contained in:
Paul Eggert 2013-07-22 16:30:54 +01:00
parent 6874724a3d
commit 368a85a4db
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
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.

11
src/sysdep.c
View file

@ -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