From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 7 Sep 2007 02:44:57 +0000 (+0000)
Subject: * libltdl/lt_dlloader.c (loader_callback, lt_dlloader_get): Use
X-Git-Tag: release-2-1b~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5bb5e0e7a5765ce143664ae0e28e7c4bfd3b3e0;p=thirdparty%2Flibtool.git

* libltdl/lt_dlloader.c (loader_callback, lt_dlloader_get): Use
NULL, not 0, for the benefit of too picky compilers like PGI.
* slist.c (slist_tail): Likewise.  Include stddef.h, for NULL.
Report by Jeff Squyres.
---

diff --git a/ChangeLog b/ChangeLog
index 8e85e4ff4..690d2b87f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/lt_dlloader.c (loader_callback, lt_dlloader_get): Use
+	NULL, not 0, for the benefit of too picky compilers like PGI.
+	* slist.c (slist_tail): Likewise.  Include stddef.h, for NULL.
+	Report by Jeff Squyres.
+
 2007-09-05  Eric Blake  <ebb9@byu.net>
 
 	* libltdl/ltdl.c (lt_dlcaller_get_data): Work even when no caller
diff --git a/libltdl/lt_dlloader.c b/libltdl/lt_dlloader.c
index 80f6cfb34..cd4efcd83 100644
--- a/libltdl/lt_dlloader.c
+++ b/libltdl/lt_dlloader.c
@@ -52,7 +52,7 @@ loader_callback (SList *item, void *userdata)
 
   assert (vtable);
 
-  return streq (vtable->name, name) ? (void *) item : 0;
+  return streq (vtable->name, name) ? (void *) item : NULL;
 }
 
 
@@ -139,7 +139,7 @@ lt_dlloader_next (lt_dlloader loader)
 const lt_dlvtable *
 lt_dlloader_get	(lt_dlloader loader)
 {
-  return (const lt_dlvtable *) (loader ? ((SList *) loader)->userdata : 0);
+  return (const lt_dlvtable *) (loader ? ((SList *) loader)->userdata : NULL);
 }
 
 
diff --git a/libltdl/slist.c b/libltdl/slist.c
index c722801d6..deeb8e833 100644
--- a/libltdl/slist.c
+++ b/libltdl/slist.c
@@ -31,6 +31,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 #include <assert.h>
 
 #include "slist.h"
+#include <stddef.h>
 
 static SList *	slist_sort_merge    (SList *left, SList *right,
 				     SListCompare *compare, void *userdata);
@@ -177,7 +178,7 @@ slist_cons (SList *item, SList *slist)
 SList *
 slist_tail (SList *slist)
 {
-  return slist ? slist->next : 0;
+  return slist ? slist->next : NULL;
 }
 
 /* Return a list starting at the Nth item of SLIST.  If SLIST is less