diff options
Diffstat (limited to 'editors/xemacs/patches/patch-ah')
| -rw-r--r-- | editors/xemacs/patches/patch-ah | 54 |
1 files changed, 39 insertions, 15 deletions
diff --git a/editors/xemacs/patches/patch-ah b/editors/xemacs/patches/patch-ah index a409897114b..7926b5b7936 100644 --- a/editors/xemacs/patches/patch-ah +++ b/editors/xemacs/patches/patch-ah @@ -1,17 +1,41 @@ -$NetBSD: patch-ah,v 1.3 1999/10/29 13:27:32 fvdl Exp $ +$NetBSD: patch-ah,v 1.4 2000/09/28 11:28:24 toshii Exp $ ---- src/unexelf.c.orig Sun Aug 15 03:29:56 1999 -+++ src/unexelf.c Fri Oct 29 07:10:13 1999 -@@ -426,3 +426,3 @@ - #include <fcntl.h> --#if !defined (__NetBSD__) && !defined (__OpenBSD__) -+#if !defined (__OpenBSD__) && (!defined(__NetBSD__) || (__NetBSD_Version__ >= 104130000)) - #include <elf.h> -@@ -473,3 +473,6 @@ +--- src/unexelf.c.orig Sat Dec 4 13:13:06 1999 ++++ src/unexelf.c +@@ -482,6 +482,7 @@ + # endif + # include <sys/exec_elf.h> --#ifdef __NetBSD__ -+/* -+ * NetBSD has <elf.h> since 1.4M -+ */ -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 104130000) - /* ++# ifndef PT_LOAD + # define PT_LOAD Elf_pt_load + # define SHT_SYMTAB Elf_sht_symtab + # define SHT_DYNSYM Elf_sht_dynsym +@@ -493,6 +494,7 @@ + # define SHN_UNDEF Elf_eshn_undefined + # define SHN_ABS Elf_eshn_absolute + # define SHN_COMMON Elf_eshn_common ++# endif + + # ifdef __alpha__ + # include <sys/exec_ecoff.h> +@@ -511,10 +513,18 @@ + + #ifndef ElfW + # ifdef __STDC__ +-# define ElfW(type) Elf32_##type ++# define ElfBitsW(bits, type) Elf##bits##_##type ++# else ++# define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type ++# endif ++# if defined (_LP64) || defined(__alpha__) ++# define ELFSIZE 64 + # else +-# define ElfW(type) Elf32_/**/type ++# define ELFSIZE 32 + # endif ++ /* This macro expands `bits' before invoking ElfBitsW. */ ++# define ElfExpandBitsW(bits, type) ElfBitsW (bits, type) ++# define ElfW(type) ElfExpandBitsW (ELFSIZE, type) + #endif + + #ifndef ELF_BSS_SECTION_NAME |