Module Name: src
Committed By: pooka
Date: Thu Feb 24 10:58:54 UTC 2011
Modified Files:
src/libexec/ld.elf_so: rtld.c
Log Message:
make DEBUG compile without RTLD_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.137 src/libexec/ld.elf_so/rtld.c:1.138
--- src/libexec/ld.elf_so/rtld.c:1.137 Fri Dec 24 12:41:43 2010
+++ src/libexec/ld.elf_so/rtld.c Thu Feb 24 10:58:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.137 2010/12/24 12:41:43 skrll Exp $ */
+/* $NetBSD: rtld.c,v 1.138 2011/02/24 10:58:54 pooka Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.137 2010/12/24 12:41:43 skrll Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.138 2011/02/24 10:58:54 pooka Exp $");
#endif /* not lint */
#include <err.h>
@@ -325,9 +325,11 @@
const Obj_Entry **real___mainprog_obj;
char ***real_environ;
#ifdef DEBUG
- int i = 0;
const char *ld_debug;
#endif
+#ifdef RTLD_DEBUG
+ int i = 0;
+#endif
/*
* On entry, the dynamic linker itself has not been relocated yet.
