XFree86 4.3.0.1xf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-4_3_0_1xf86-012804-2330PRE_xf86-4_3_0_1

4 files changed, 15 insertions, 9 deletions

diff --git a/src/XDelAssoc.c b/src/XDelAssoc.c
index 1ab5687..7ccf7f1 100644
--- a/src/XDelAssoc.c
+++ b/src/XDelAssoc.c
@@ -24,6 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.4 2001/12/14 19:57:02 dawes Exp $ */
 
 #include "Xlibint.h"
 #include "X10.h"
@@ -33,6 +34,7 @@ in this Software without prior written authorization from The Open Group.
  * an XId.  An association may be removed only once.  Redundant
  * deletes are meaningless (but cause no problems).
  */
+int
 XDeleteAssoc(dpy, table, x_id)
         register Display *dpy;
 	register XAssocTable *table;
@@ -61,7 +63,7 @@ XDeleteAssoc(dpy, table, x_id)
 				Entry->prev->next = Entry->next;
 				Entry->next->prev = Entry->prev;
 				Xfree((char *)Entry);
-				return;
+				return 0;
 			}
 			/* Oops, identical XId's on different displays! */
 			continue;
@@ -69,10 +71,9 @@ XDeleteAssoc(dpy, table, x_id)
 		if (Entry->x_id > x_id) {
 			/* We have gone past where it should be. */
 			/* It is apparently not in the table. */
-			return;
+			return 0;
 		}
 	}
 	/* It is apparently not in the table. */
-	return;
+	return 0;
 }
-
diff --git a/src/XDestAssoc.c b/src/XDestAssoc.c
index 87f4fe9..ab89e06 100644
--- a/src/XDestAssoc.c
+++ b/src/XDestAssoc.c
@@ -24,6 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.4 2001/12/14 19:57:02 dawes Exp $ */
 
 #include "Xlibint.h"
 #include "X10.h"
@@ -32,6 +33,7 @@ in this Software without prior written authorization from The Open Group.
  * XDestroyAssocTable - Destroy (free the memory associated with)
  * an XAssocTable.  
  */
+int
 XDestroyAssocTable(table)
 	register XAssocTable *table;
 {
@@ -57,5 +59,6 @@ XDestroyAssocTable(table)
 
 	/* Free the table. */
 	Xfree((char *)table);
+	return 0;
 }
 
diff --git a/src/XDraw.c b/src/XDraw.c
index d7f435c..03fde2a 100644
--- a/src/XDraw.c
+++ b/src/XDraw.c
@@ -26,6 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/oldX/XDraw.c,v 1.5 2001/12/14 19:57:02 dawes Exp $ */
 
 #include "Xlibint.h"
 #include "Xlib.h"
@@ -33,9 +34,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define OK_RETURN 1
 #define ERR_RETURN 0
-#ifndef NULL
-#define NULL 0
-#endif
+#include <stddef.h>
 
 /*
 
@@ -200,7 +199,7 @@ static short segtable[] = {  10,  3, 56,	/* pl <= 10, 3 segments     */
  *
  */
 							 
-static vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
+static int vertices_converter(pathaddr, pathcount, ppathaddr_new, newpathcnt)
   Vertex  *pathaddr;	    /* address of original path list             */
   int	  pathcount;        /* number of points in original path list    */
   Vertex  **ppathaddr_new;  /* ptr to addr of new path list      */
diff --git a/src/XMakeAssoc.c b/src/XMakeAssoc.c
index 9e3f2b6..734313d 100644
--- a/src/XMakeAssoc.c
+++ b/src/XMakeAssoc.c
@@ -24,6 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.4 2001/12/14 19:57:03 dawes Exp $ */
 
 #include "Xlibint.h"
 #include "X10.h"
@@ -34,6 +35,7 @@ in this Software without prior written authorization from The Open Group.
  * meaningless (but cause no problems).  The queue in each association
  * bucket is sorted (lowest XId to highest XId).
  */
+int
 XMakeAssoc(dpy, table, x_id, data)
 	register Display *dpy;
 	register XAssocTable *table;
@@ -71,7 +73,7 @@ XMakeAssoc(dpy, table, x_id, data)
 					/* entry with this XId and Display, */
 					/* reset its data value and return. */
 					Entry->data = data;
-					return;
+					return 0;
 				}
 				/* We found an association with the right */
 				/* id but the wrong display! */
@@ -103,5 +105,6 @@ XMakeAssoc(dpy, table, x_id, data)
 	new_entry->next = Entry;
 	Entry->prev->next = new_entry;
 	Entry->prev = new_entry;
+	return 0;
 }