diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2013-04-09 18:14:37 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2013-04-09 18:14:37 +0000 |
| commit | 117bb8acc0d9aaeb9b2cb0fefd5e4a1805736119 (patch) | |
| tree | 6264244dc4098299751597cc67d35363c96be7e4 /editors | |
| parent | d6117118eab87298126ca1135b42dc63b3de3654 (diff) | |
| download | ports-117bb8acc0d9aaeb9b2cb0fefd5e4a1805736119.tar.gz ports-117bb8acc0d9aaeb9b2cb0fefd5e4a1805736119.zip | |
- Fix brokenness on SPARC platforms
Reported by: tabthorpe
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=315774
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs-devel/files/patch-src_sysdep.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/editors/emacs-devel/files/patch-src_sysdep.c b/editors/emacs-devel/files/patch-src_sysdep.c index 7b03201d37e5..312388756c88 100644 --- a/editors/emacs-devel/files/patch-src_sysdep.c +++ b/editors/emacs-devel/files/patch-src_sysdep.c @@ -3,29 +3,24 @@ $FreeBSD$ --- src/sysdep.c.orig +++ src/sysdep.c -@@ -37,6 +37,20 @@ - #include "sysselect.h" - #include "blockinput.h" +@@ -43,7 +43,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 +@@ -2583,6 +2591,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 @@ +@@ -3294,6 +3336,176 @@ return attrs; } |