diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2014-02-23 00:55:46 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2014-02-23 00:55:46 +0000 |
| commit | 421d89c84a033c02e2cf64cd4e2c6653104b848a (patch) | |
| tree | 79598de2ce412422f08f7c648e5335938bb3bd7c | |
| parent | Update to 0.24.5 (missed in r345681). (diff) | |
- Update the diff to fix building on Sparc and ARM platforms
Submitted by: Nicolas Edel <nicolas.edel@gmail.com> (via private email)
| -rw-r--r-- | editors/emacs/files/patch-src_sysdep.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/editors/emacs/files/patch-src_sysdep.c b/editors/emacs/files/patch-src_sysdep.c index 7b03201d37e5..515713f3b404 100644 --- a/editors/emacs/files/patch-src_sysdep.c +++ b/editors/emacs/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" +@@ -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; } |