From f991f0978cd93e4f687887d3389926051e545f24 Mon Sep 17 00:00:00 2001
From: hannken <hannken@NetBSD.org>
Date: Fri, 22 Oct 1999 10:10:36 +0000
Subject: [PATCH] Undo last change. While these macros are defined in
 exec_elf.h, they are enclosed by `#ifdef _KERNEL'.

---
 lib/libc/gen/nlist_elf32.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/libc/gen/nlist_elf32.c b/lib/libc/gen/nlist_elf32.c
index d9d6214795b9..62249d6a1bd1 100644
--- a/lib/libc/gen/nlist_elf32.c
+++ b/lib/libc/gen/nlist_elf32.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nlist_elf32.c,v 1.16 1999/10/21 21:12:37 erh Exp $	*/
+/*	$NetBSD: nlist_elf32.c,v 1.17 1999/10/22 10:10:36 hannken Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -56,6 +56,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)))
+
 /* No need to check for off < 0 because it is unsigned */
 #define	check(off, size)	(off + size > mappedsize)
 #define	BAD			goto out