From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 2 May 2003 22:37:58 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~776
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f903b5155c9c847d43eb3acefac367bf3927f0d8;p=thirdparty%2Fglibc.git

Update.

	* sysdeps/generic/dl-fptr.c (_dl_make_fptr): Use 0 not NULL for
	comparing ftab elements.
	(_dl_unmap): Fix typo in test.
---

diff --git a/ChangeLog b/ChangeLog
index 2a5a4004a87..92f53f8e2bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2003-05-02  Ulrich Drepper  <drepper@redhat.com>
 
-	* sysdeps/generic/dl-fptr.c (_dl_unmap): Fix typo in test.
+	* sysdeps/generic/dl-fptr.c (_dl_make_fptr): Use 0 not NULL for
+	comparing ftab elements.
+	(_dl_unmap): Fix typo in test.
 	(_dl_make_fptr): Fix typos introduced in last change.
 
 	* sysdeps/generic/dl-fptr.c: Put back one optimization from the
diff --git a/sysdeps/generic/dl-fptr.c b/sysdeps/generic/dl-fptr.c
index f3542bca2e8..97688508465 100644
--- a/sysdeps/generic/dl-fptr.c
+++ b/sysdeps/generic/dl-fptr.c
@@ -220,7 +220,7 @@ _dl_make_fptr (struct link_map *map, const ElfW(Sym) *sym,
     INTUSE(_dl_signal_error) (0, NULL, NULL, N_("\
 internal error: symidx out of range of fptr table"));
 
-  while (ftab[symidx] == NULL)
+  while (ftab[symidx] == 0)
     {
       /* GOT has already been relocated in elf_get_dynamic_info -
 	 don't try to relocate it again.  */