Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 23167)
+++ trunk/src/netlist.c	(revision 23168)
@@ -263,7 +263,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a subnet, allocates memory if necessary
  */
-pcb_oldnet_t *pcb_net_new(pcb_board_t *pcb, pcb_netlist_t *Netlist)
+pcb_oldnet_t *pcb_net_new(pcb_board_t *pcb, pcb_oldnetlist_t *Netlist)
 {
 	pcb_oldnet_t *net = Netlist->Net;
 
@@ -284,16 +284,16 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a net list, allocates memory if necessary
  */
-pcb_netlist_t *pcb_netlist_new(pcb_netlist_list_t *Netlistlist)
+pcb_oldnetlist_t *pcb_netlist_new(pcb_netlist_list_t *Netlistlist)
 {
-	pcb_netlist_t *netlist = Netlistlist->NetList;
+	pcb_oldnetlist_t *netlist = Netlistlist->NetList;
 
 	/* realloc new memory if necessary and clear it */
 	if (Netlistlist->NetListN >= Netlistlist->NetListMax) {
 		Netlistlist->NetListMax += STEP_POINT;
-		netlist = (pcb_netlist_t *) realloc(netlist, Netlistlist->NetListMax * sizeof(pcb_netlist_t));
+		netlist = (pcb_oldnetlist_t *) realloc(netlist, Netlistlist->NetListMax * sizeof(pcb_oldnetlist_t));
 		Netlistlist->NetList = netlist;
-		memset(netlist + Netlistlist->NetListN, 0, STEP_POINT * sizeof(pcb_netlist_t));
+		memset(netlist + Netlistlist->NetListN, 0, STEP_POINT * sizeof(pcb_oldnetlist_t));
 	}
 	return (netlist + Netlistlist->NetListN++);
 }
@@ -301,7 +301,7 @@
 /* ---------------------------------------------------------------------------
  * frees memory used by a net
  */
-void pcb_netlist_free(pcb_netlist_t *Netlist)
+void pcb_netlist_free(pcb_oldnetlist_t *Netlist)
 {
 	if (Netlist) {
 		PCB_NET_LOOP(Netlist);
@@ -310,7 +310,7 @@
 		}
 		PCB_END_LOOP;
 		free(Netlist->Net);
-		memset(Netlist, 0, sizeof(pcb_netlist_t));
+		memset(Netlist, 0, sizeof(pcb_oldnetlist_t));
 	}
 }
 
Index: trunk/src/netlist.h
===================================================================
--- trunk/src/netlist.h	(revision 23167)
+++ trunk/src/netlist.h	(revision 23168)
@@ -47,12 +47,12 @@
 	pcb_cardinal_t NetN,								/* the number of subnets contained */
 	  NetMax;											/* max subnets from malloc */
 	pcb_oldnet_t *Net;
-} pcb_netlist_t;
+} pcb_oldnetlist_t;
 
 typedef struct {								/* holds a list of net lists */
 	pcb_cardinal_t NetListN,						/* the number of net lists contained */
 	  NetListMax;									/* max net lists from malloc */
-	pcb_netlist_t *NetList;
+	pcb_oldnetlist_t *NetList;
 } pcb_netlist_list_t;
 
 
@@ -96,15 +96,15 @@
 
 #define PCB_NETLIST_INVALID_INDEX ((pcb_cardinal_t)(-1))
 
-pcb_oldnet_t *pcb_net_new(pcb_board_t *pcb, pcb_netlist_t *);
-pcb_netlist_t *pcb_netlist_new(pcb_netlist_list_t *);
+pcb_oldnet_t *pcb_net_new(pcb_board_t *pcb, pcb_oldnetlist_t *);
+pcb_oldnetlist_t *pcb_netlist_new(pcb_netlist_list_t *);
 void pcb_netlist_list_free(pcb_netlist_list_t *);
-void pcb_netlist_free(pcb_netlist_t *);
+void pcb_netlist_free(pcb_oldnetlist_t *);
 void pcb_oldnet_free(pcb_oldnet_t *);
 
 #define PCB_NETLIST_LOOP(top) do   {                            \
         pcb_cardinal_t        n;                                \
-        pcb_netlist_t *  netlist;                               \
+        pcb_oldnetlist_t *  netlist;                               \
         for (n = (top)->NetListN-1; n != -1; n--)               \
         {                                                       \
                 netlist = &(top)->NetList[n]
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 23167)
+++ trunk/src/rats.c	(revision 23168)
@@ -63,10 +63,10 @@
 #define BESTFOUND 0x2
 
 static pcb_bool ParseConnection(const char *, char *, char *);
-static pcb_bool DrawShortestRats(pcb_netlist_t *,
+static pcb_bool DrawShortestRats(pcb_oldnetlist_t *,
 														 void (*)(register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *));
 static pcb_bool CheckShorts(pcb_lib_menu_t *);
-static void TransferNet(pcb_netlist_t *, pcb_oldnet_t *, pcb_oldnet_t *);
+static void TransferNet(pcb_oldnetlist_t *, pcb_oldnet_t *, pcb_oldnet_t *);
 
 static pcb_bool badnet = pcb_false;
 static pcb_layergrp_id_t Sgrp = -1, Cgrp = -1; /* layer group holding solder/component side */
@@ -210,12 +210,12 @@
 	}
 }
 
-pcb_netlist_t *pcb_rat_proc_netlist(pcb_lib_t *net_menu)
+pcb_oldnetlist_t *pcb_rat_proc_netlist(pcb_lib_t *net_menu)
 {
 	pcb_connection_t *connection;
 	pcb_connection_t LastPoint;
 	pcb_oldnet_t *net;
-	static pcb_netlist_t *Wantlist = NULL;
+	static pcb_oldnetlist_t *Wantlist = NULL;
 
 	if (!net_menu->MenuN)
 		return NULL;
@@ -228,7 +228,7 @@
 	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &Sgrp, 1);
 	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &Cgrp, 1);
 
-	Wantlist = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t));
+	Wantlist = (pcb_oldnetlist_t *) calloc(1, sizeof(pcb_oldnetlist_t));
 	if (Wantlist) {
 		clear_drc_flag(1);
 		PCB_MENU_LOOP(net_menu);
@@ -287,7 +287,7 @@
 }
 
 /* copy all connections from one net into another and then remove the first net from its netlist */
-static void TransferNet(pcb_netlist_t *Netl, pcb_oldnet_t *SourceNet, pcb_oldnet_t *DestNet)
+static void TransferNet(pcb_oldnetlist_t *Netl, pcb_oldnet_t *SourceNet, pcb_oldnet_t *DestNet)
 {
 	pcb_connection_t *conn;
 
@@ -429,7 +429,7 @@
 	return warn;
 }
 
-static void gather_subnet_objs(pcb_data_t *data, pcb_netlist_t *Netl, pcb_oldnet_t *a)
+static void gather_subnet_objs(pcb_data_t *data, pcb_oldnetlist_t *Netl, pcb_oldnet_t *a)
 {
 	pcb_connection_t *conn;
 
@@ -504,7 +504,7 @@
 /* Determine existing interconnections of the net and gather into sub-nets.
  * Initially the netlist has each connection in its own individual net
  * afterwards there can be many fewer nets with multiple connections each */
-static pcb_bool gather_subnets(pcb_netlist_t *Netl, pcb_bool NoWarn, pcb_bool AndRats)
+static pcb_bool gather_subnets(pcb_oldnetlist_t *Netl, pcb_bool NoWarn, pcb_bool AndRats)
 {
 	pcb_oldnet_t *a, *b;
 	pcb_bool Warned = pcb_false;
@@ -548,7 +548,7 @@
  * state for the net, with each Netl->Net[N] representing one
  * copper-connected subset of the net. */
 static pcb_bool
-DrawShortestRats(pcb_netlist_t *Netl,
+DrawShortestRats(pcb_oldnetlist_t *Netl,
 								 void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *))
 {
 	pcb_rat_t *line;
@@ -694,7 +694,7 @@
 pcb_rat_add_all(pcb_bool SelectedOnly,
 					 void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *))
 {
-	pcb_netlist_t *Nets, *Wantlist;
+	pcb_oldnetlist_t *Nets, *Wantlist;
 	pcb_oldnet_t *lonesome;
 	pcb_connection_t *onepin;
 	pcb_bool changed, Warned = pcb_false;
@@ -711,7 +711,7 @@
 	}
 	changed = pcb_false;
 	/* initialize finding engine */
-	Nets = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t));
+	Nets = (pcb_oldnetlist_t *) calloc(1, sizeof(pcb_oldnetlist_t));
 	/* now we build another netlist (Nets) for each
 	 * net in Wantlist that shows how it actually looks now,
 	 * then fill in any missing connections with rat lines.
@@ -777,7 +777,7 @@
 pcb_netlist_list_t pcb_rat_collect_subnets(pcb_bool SelectedOnly)
 {
 	pcb_netlist_list_t result = { 0, 0, NULL };
-	pcb_netlist_t *Nets, *Wantlist;
+	pcb_oldnetlist_t *Nets, *Wantlist;
 	pcb_oldnet_t *lonesome;
 	pcb_connection_t *onepin;
 
Index: trunk/src/rats.h
===================================================================
--- trunk/src/rats.h	(revision 23167)
+++ trunk/src/rats.h	(revision 23168)
@@ -59,7 +59,7 @@
 
 
 /* Read the library-netlist and build a pcb_true Netlist structure */
-pcb_netlist_t *pcb_rat_proc_netlist(pcb_lib_t *net_menu);
+pcb_oldnetlist_t *pcb_rat_proc_netlist(pcb_lib_t *net_menu);
 
 pcb_netlist_list_t pcb_rat_collect_subnets(pcb_bool SelectedOnly);
 
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 23167)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 23168)
@@ -78,7 +78,7 @@
 }
 #define EXPANDRECT(r1, r2) EXPANDRECTXY(r1, r2->X1, r2->Y1, r2->X2, r2->Y2)
 
-static double ComputeCost(pcb_netlist_t *Nets, double T0, double T);
+static double ComputeCost(pcb_oldnetlist_t *Nets, double T0, double T);
 
 const struct {
 	double via_cost;
@@ -162,7 +162,7 @@
  * Update the X, Y and group position information stored in the NetList after
  * subcircuits have possibly been moved, rotated, flipped, etc.
  */
-static void UpdateXY(pcb_netlist_t *Nets)
+static void UpdateXY(pcb_oldnetlist_t *Nets)
 {
 	pcb_layergrp_id_t SLayer = -1, CLayer = -1;
 	pcb_cardinal_t i, j;
@@ -333,7 +333,7 @@
  *  "Placement and Routing of Electronic Modules" edited by Michael Pecht
  *  Marcel Dekker, Inc. 1993.  ISBN: 0-8247-8916-4 TK7868.P7.P57 1993
  */
-static double ComputeCost(pcb_netlist_t *Nets, double T0, double T)
+static double ComputeCost(pcb_oldnetlist_t *Nets, double T0, double T)
 {
 	double W = 0;									/* wire cost */
 	double delta1 = 0;						/* wire congestion penalty function */
@@ -737,7 +737,7 @@
  */
 pcb_bool AutoPlaceSelected(void)
 {
-	pcb_netlist_t *Nets;
+	pcb_oldnetlist_t *Nets;
 	vtp0_t Selected;
 	PerturbationType pt;
 	double C00, C0, T0;
Index: trunk/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 23167)
+++ trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 23168)
@@ -113,7 +113,7 @@
 static fgw_error_t pcb_act_smartdisperse(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	int op = -2;
-	pcb_netlist_t *Nets;
+	pcb_oldnetlist_t *Nets;
 	htpi_t visited;
 	int all;