[src/trunk]: src/usr.sbin Undo last change. While these macros are defined in...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8675ebf2d1bc
branches:  trunk
changeset: 477581:8675ebf2d1bc
user:      hannken <hannken%NetBSD.org@localhost>
date:      Fri Oct 22 10:58:00 1999 +0000

description:
Undo last change. While these macros are defined in exec_elf.h, they are
enclosed by `#ifdef _KERNEL'.

diffstat:

 usr.sbin/kvm_mkdb/nlist_elf32.c  |  10 ++++++++--
 usr.sbin/mdsetimage/exec_elf32.c |  10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 283d80b1ae46 -r 8675ebf2d1bc usr.sbin/kvm_mkdb/nlist_elf32.c
--- a/usr.sbin/kvm_mkdb/nlist_elf32.c   Fri Oct 22 10:47:37 1999 +0000
+++ b/usr.sbin/kvm_mkdb/nlist_elf32.c   Fri Oct 22 10:58:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nlist_elf32.c,v 1.7 1999/10/21 21:17:08 erh Exp $      */
+/*     $NetBSD: nlist_elf32.c,v 1.8 1999/10/22 10:58:00 hannken Exp $  */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: nlist_elf32.c,v 1.7 1999/10/21 21:17:08 erh Exp $");
+__RCSID("$NetBSD: nlist_elf32.c,v 1.8 1999/10/22 10:58:00 hannken Exp $");
 #endif /* not lint */
 
 /* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
@@ -65,6 +65,12 @@
 #if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
     (defined(NLIST_ELF64) && (ELFSIZE == 64))
 
+#define CONCAT(x,y)     __CONCAT(x,y)
+#define ELFNAME(x)      CONCAT(elf,CONCAT(ELFSIZE,CONCAT(_,x)))
+#define ELFNAME2(x,y)   CONCAT(x,CONCAT(_elf,CONCAT(ELFSIZE,CONCAT(_,y))))
+#define ELFNAMEEND(x)   CONCAT(x,CONCAT(_elf,ELFSIZE))
+#define ELFDEFNNAME(x)  CONCAT(ELF,CONCAT(ELFSIZE,CONCAT(_,x)))
+
 typedef struct nlist NLIST;
 #define        _strx   n_un.n_strx
 #define        _name   n_un.n_name
diff -r 283d80b1ae46 -r 8675ebf2d1bc usr.sbin/mdsetimage/exec_elf32.c
--- a/usr.sbin/mdsetimage/exec_elf32.c  Fri Oct 22 10:47:37 1999 +0000
+++ b/usr.sbin/mdsetimage/exec_elf32.c  Fri Oct 22 10:58:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf32.c,v 1.3 1999/10/21 21:18:02 erh Exp $       */
+/*     $NetBSD: exec_elf32.c,v 1.4 1999/10/22 11:05:59 hannken Exp $   */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: exec_elf32.c,v 1.3 1999/10/21 21:18:02 erh Exp $");
+__RCSID("$NetBSD: exec_elf32.c,v 1.4 1999/10/22 11:05:59 hannken Exp $");
 #endif /* not lint */
 
 #ifndef ELFSIZE
@@ -51,6 +51,12 @@
 #if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
     (defined(NLIST_ELF64) && (ELFSIZE == 64))
 
+#define        CONCAT(x,y)     __CONCAT(x,y)
+#define        ELFNAME(x)      CONCAT(elf,CONCAT(ELFSIZE,CONCAT(_,x)))
+#define        ELFNAME2(x,y)   CONCAT(x,CONCAT(_elf,CONCAT(ELFSIZE,CONCAT(_,y))))
+#define        ELFNAMEEND(x)   CONCAT(x,CONCAT(_elf,ELFSIZE))
+#define        ELFDEFNNAME(x)  CONCAT(ELF,CONCAT(ELFSIZE,CONCAT(_,x)))
+
 #define        check(off, size)        ((off < 0) || (off + size > mappedsize))
 #define        BAD                     do { rv = -1; goto out; } while (0)