merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 5 insertions, 3 deletions

diff --git a/src/list.c b/src/list.c
index e0f4774..4aabbad 100644
--- a/src/list.c
+++ b/src/list.c
@@ -48,6 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
+/* $XFree86: xc/programs/twm/list.c,v 1.8 2002/09/24 21:00:27 tsi Exp $ */
 
 
 /**********************************************************************
@@ -65,6 +66,7 @@ in this Software without prior written authorization from The Open Group.
 #include "twm.h"
 #include "screen.h"
 #include "gram.h"
+#include "util.h"
 
 struct name_list_struct
 {
@@ -106,9 +108,9 @@ char *ptr;
     if (nptr == NULL)
     {
 	twmrc_error_prefix();
-	fprintf (stderr, "unable to allocate %d bytes for name_list\n",
-		 sizeof(name_list));
-	Done();
+	fprintf (stderr, "unable to allocate %ld bytes for name_list\n",
+		 (unsigned long)sizeof(name_list));
+	Done(0);
     }
 
     nptr->next = *list_head;