[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113491: * sysdep.c (frame) [__FreeBSD__]: #define t
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r113491: * sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame |
Date: |
Mon, 22 Jul 2013 15:30:58 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113491
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14923
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-22 16:30:54 +0100
message:
* 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'.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/sysdep.c sysdep.c-20091113204419-o5vbwnq5f7feedwu-448
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-07-21 15:56:55 +0000
+++ b/src/ChangeLog 2013-07-22 15:30:54 +0000
@@ -1,3 +1,9 @@
+2013-07-22 Paul Eggert <address@hidden>
+
+ * 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 <address@hidden>
* alloc.c (make_save_ptr_ptr): Define this function.
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2013-07-19 05:36:50 +0000
+++ b/src/sysdep.c 2013-07-22 15:30:54 +0000
@@ -42,9 +42,14 @@
#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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113491: * sysdep.c (frame) [__FreeBSD__]: #define to freebsd_frame,
Paul Eggert <=