Crash landing of the fix for bug #472883: BSD curses.h allready declares LL.

server/client_data.h

@@ -9,10 +9,10 @@ typedef struct client_data {
 	int ack;
 	char *name;
 	// and other stuff...  doesn't matter yet
-	LL *screenlist;
+	LinkedList *screenlist;
 	// list of requested keys...
 	char *client_keys ;
-	LL *menulist;
+	LinkedList *menulist;
 
 } client_data;
 

server/clients.c

@@ -22,7 +22,7 @@
 #include "client_data.h"
 #include "shared/debug.h"
 
-LL *clients;
+LinkedList *clients;
 
 // Initialize and kill client list...
 int

server/clients.h

@@ -7,12 +7,12 @@
 typedef struct client {
 	int sock;
 	char addr[64];
-	LL *messages;
+	LinkedList *messages;
 	client_data *data;
 
 } client;
 
-extern LL *clients;
+extern LinkedList *clients;
 
 // Initialize and kill client list...
 int client_init ();

server/drivers.c

@@ -25,7 +25,7 @@
 // lcd.h is used for the driver API definition
 
 
-LL * loaded_drivers = NULL;
+LinkedList * loaded_drivers = NULL;
 
 long int empty_function() { return 0; }
 

server/drivers/lcd.c

@@ -229,7 +229,7 @@ lcd_physical_driver drivers[] = {
 
 };
 
-LL *list;
+LinkedList *list;
 
 #define CurrentDriver (drivers[i].name)
 #define NextDriver (drivers[i+1].name)

server/render.c

@@ -41,7 +41,7 @@ static int reset;
 
 #define BUFSIZE 1024
 
-static int draw_frame (LL * list, char fscroll, int left, int top, int right, int bottom, int fwid, int fhgt, int fspeed, int timer);
+static int draw_frame (LinkedList * list, char fscroll, int left, int top, int right, int bottom, int fwid, int fhgt, int fspeed, int timer);
 
 int
 draw_screen (screen * s, int timer)
@@ -145,7 +145,7 @@ draw_screen (screen * s, int timer)
 // Best thing to do is to remove support for frames... but anyway...
 //
 static int
-draw_frame (LL * list,
+draw_frame (LinkedList * list,
 		char fscroll,	// direction of scrolling
 		int left,	// left edge of frame
 		int top,	// top edge of frame

server/screen.h

@@ -12,7 +12,7 @@ typedef struct screen {
 	int duration;
 	int heartbeat;
 	char *keys;
-	LL *widgets;
+	LinkedList *widgets;
 	client *parent;
 } screen;
 

server/screenlist.c

@@ -13,7 +13,7 @@ int screenlist_action = 0;
 
 int timer = 0;
 
-LL *screenlist;
+LinkedList *screenlist;
 
 int screenlist_add_end (screen * screen);
 screen *screenlist_next_roll ();
@@ -76,7 +76,7 @@ screenlist_remove_all (screen * s)
 	return i;
 }
 
-LL *
+LinkedList *
 screenlist_getlist ()
 {
 	debug ("screenlist_getlist()\n");

server/screenlist.h

@@ -16,7 +16,7 @@ extern int timer;
 int screenlist_init ();
 int screenlist_shutdown ();
 
-LL *screenlist_getlist ();
+LinkedList *screenlist_getlist ();
 screen *screenlist_current ();
 
 int screenlist_add (screen * s);

server/widget.c

@@ -22,8 +22,8 @@ char *types[] = { "none",
 	NULL,
 };
 
-static widget *widget_finder (LL * list, char *id);
-static int widget_remover (LL * list, widget * w);
+static widget *widget_finder (LinkedList * list, char *id);
+static int widget_remover (LinkedList * list, widget * w);
 
 widget *
 widget_create ()
@@ -59,7 +59,7 @@ widget_create ()
 int
 widget_destroy (widget * w)
 {
-	LL *list;
+	LinkedList *list;
 	widget *foo;
 
 	if (!w)
@@ -110,7 +110,7 @@ widget_find (screen * s, char *id)
 }
 
 widget *
-widget_finder (LL * list, char *id)
+widget_finder (LinkedList * list, char *id)
 {
 	widget *w, *err;
 
@@ -153,7 +153,7 @@ widget_add (screen * s, char *id, char *type, char *in, int sock)
 	int valid = 0;
 	int wid_type = 0;
 	widget *w, *parent;
-	LL *list;
+	LinkedList *list;
 
 	debug ("widget_add(%s, %s, %s)\n", id, type, in);
 
@@ -249,7 +249,7 @@ int
 widget_remove (screen * s, char *id, int sock)
 {
 	widget *w;
-	LL *list;
+	LinkedList *list;
 
 	debug ("widget_remove(%s)\n", id);
 
@@ -286,7 +286,7 @@ widget_remove (screen * s, char *id, int sock)
 }
 
 int
-widget_remover (LL * list, widget * w)
+widget_remover (LinkedList * list, widget * w)
 {
 	widget *foo, *bar;
 	int err;

server/widget.h

@@ -13,7 +13,7 @@ typedef struct widget {
 	int length;						  // size or direction
 	int speed;						  // For scroller...
 	char *text;						  // text or binary data
-	LL *kids;						  // Frames can contain more widgets...
+	LinkedList *kids;						  // Frames can contain more widgets...
 } widget;
 
 // These correspond to the index into the "types" array...