Date: Tue, 9 Apr 2013 18:11:23 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315773 - head/editors/emacs/files Message-ID: <201304091811.r39IBNcI096485@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Tue Apr 9 18:11:23 2013 New Revision: 315773 URL: http://svnweb.freebsd.org/changeset/ports/315773 Log: - Fix brokenness on SPARC platforms Reported by: tabthorpe Approved by: portmgr Modified: head/editors/emacs/files/patch-src_sysdep.c Modified: head/editors/emacs/files/patch-src_sysdep.c ============================================================================== --- head/editors/emacs/files/patch-src_sysdep.c Tue Apr 9 17:36:29 2013 (r315772) +++ head/editors/emacs/files/patch-src_sysdep.c Tue Apr 9 18:11:23 2013 (r315773) @@ -3,29 +3,24 @@ $FreeBSD$ --- src/sysdep.c.orig +++ src/sysdep.c -@@ -37,6 +37,20 @@ - #include "sysselect.h" - #include "blockinput.h" +@@ -46,7 +46,15 @@ + #endif -+#ifdef __FreeBSD__ + #ifdef __FreeBSD__ +#include <sys/sysctl.h> +/* machine/frame.h in Sparc/ARM has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */ +#if defined(__sparc__) || defined(__arm__) +#define frame freebsd_sparc_frame +#endif -+#include <sys/user.h> + #include <sys/user.h> +#if defined(__sparc__) || defined(__arm__) +#undef frame +#endif -+#include <sys/resource.h> -+#include <math.h> -+#endif -+ - #ifdef WINDOWSNT - #define read sys_read - #define write sys_write -@@ -2529,6 +2543,40 @@ - return proclist; + #include <sys/resource.h> + #include <math.h> + #endif +@@ -2691,6 +2699,40 @@ + return proclist; } +#elif defined (__FreeBSD__) @@ -65,7 +60,7 @@ $FreeBSD$ /* The WINDOWSNT implementation is in w32.c. The MSDOS implementation is in dosfns.c. */ #elif !defined (WINDOWSNT) && !defined (MSDOS) -@@ -3079,6 +3127,176 @@ +@@ -3402,6 +3444,176 @@ return attrs; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304091811.r39IBNcI096485>