2 files changed, 14 insertions, 3 deletions

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