diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2003-07-17 00:28:54 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2003-07-17 00:28:54 +0000 |
| commit | 3bd887cd282c718739c1efa4e2bce918b61c2303 (patch) | |
| tree | 6e18af03bcd8a634820efd8498d573914a0cefac /x11-servers | |
| parent | Update to 2.0.8. shlib bump. (diff) | |
Add missing newlines which got lost somehow in my patching.
Noticed by: peter
Notes
Notes:
svn path=/head/; revision=85007
Diffstat (limited to 'x11-servers')
6 files changed, 6 insertions, 6 deletions
diff --git a/x11-servers/XFree86-4-Server/files/patch-bsd-bsdResource.c b/x11-servers/XFree86-4-Server/files/patch-bsd-bsdResource.c index 1dc49cf70476..34da14506316 100644 --- a/x11-servers/XFree86-4-Server/files/patch-bsd-bsdResource.c +++ b/x11-servers/XFree86-4-Server/files/patch-bsd-bsdResource.c @@ -6,4 +6,4 @@ -#if defined(__alpha__) || defined(__sparc64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) - resPtr
\ No newline at end of file + resPtr diff --git a/x11-servers/XFree86-4-Server/files/patch-bus-Imakefile b/x11-servers/XFree86-4-Server/files/patch-bus-Imakefile index 715bebec8f61..693bcf59410a 100644 --- a/x11-servers/XFree86-4-Server/files/patch-bus-Imakefile +++ b/x11-servers/XFree86-4-Server/files/patch-bus-Imakefile @@ -6,4 +6,4 @@ -#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) +#elif defined(FreeBSDArchitecture) && (defined(AlphaArchitecture) || defined(x86_64Architecture)) -
\ No newline at end of file + diff --git a/x11-servers/XFree86-4-Server/files/patch-libc_wrapper.c b/x11-servers/XFree86-4-Server/files/patch-libc_wrapper.c index b020234be195..f299cdbdffa0 100644 --- a/x11-servers/XFree86-4-Server/files/patch-libc_wrapper.c +++ b/x11-servers/XFree86-4-Server/files/patch-libc_wrapper.c @@ -6,4 +6,4 @@ -#ifdef __x86_64__ +#if defined(__x86_64__) && defined(linux) if (flags & XF86_MAP_32BIT) f |= MAP_32BIT; - #endif
\ No newline at end of file + #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-loader-Imakefile b/x11-servers/XFree86-4-Server/files/patch-loader-Imakefile index 01f0a21e6931..628c842478e5 100644 --- a/x11-servers/XFree86-4-Server/files/patch-loader-Imakefile +++ b/x11-servers/XFree86-4-Server/files/patch-loader-Imakefile @@ -6,4 +6,4 @@ -#if defined (x86_64Architecture) +#if defined (x86_64Architecture) && defined(linux) ARCHDEFINES = -DDoMMAPedMerge -DMmapPageAlign - #endif
\ No newline at end of file + #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-loader-elfloader.c b/x11-servers/XFree86-4-Server/files/patch-loader-elfloader.c index da51296402b8..99fae89aa17e 100644 --- a/x11-servers/XFree86-4-Server/files/patch-loader-elfloader.c +++ b/x11-servers/XFree86-4-Server/files/patch-loader-elfloader.c @@ -6,4 +6,4 @@ -# if !defined (__x86_64__) +# if !defined (__x86_64__) || !defined(__linux__) # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON) - # else
\ No newline at end of file + # else diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86-common-Imakefile b/x11-servers/XFree86-4-Server/files/patch-xf86-common-Imakefile index da4d7c613798..339256aef92b 100644 --- a/x11-servers/XFree86-4-Server/files/patch-xf86-common-Imakefile +++ b/x11-servers/XFree86-4-Server/files/patch-xf86-common-Imakefile @@ -9,4 +9,4 @@ + || defined(FreeBSDArchitecture) KBD = xf86KbdBSD # else - # ifdef LinuxArchitecture
\ No newline at end of file + # ifdef LinuxArchitecture |