Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4767) +++ trunk/src/action_helper.c (revision 4768) @@ -778,7 +778,7 @@ } if (PCB->RatDraw) { - RatTypePtr line; + pcb_rat_t *line; if ((line = AddNet())) { addedLines++; AddObjectToCreateUndoList(PCB_TYPE_RATLINE, line, line, line); @@ -1138,7 +1138,7 @@ ptr = Crosshair.AttachedObject.Rubberband; for (i = 0; i < Crosshair.AttachedObject.RubberbandN; i++) { if (PCB->RatOn) - EraseRat((RatTypePtr) ptr->Line); + EraseRat((pcb_rat_t *) ptr->Line); if (TEST_FLAG(PCB_FLAG_RUBBEREND, ptr->Line)) MoveObjectToRemoveUndoList(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line); else Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 4767) +++ trunk/src/change_act.c (revision 4768) @@ -677,7 +677,7 @@ ptr = Crosshair.AttachedObject.Rubberband; for (i = 0; i < Crosshair.AttachedObject.RubberbandN; i++, ptr++) { if (PCB->RatOn) - EraseRat((RatTypePtr) ptr->Line); + EraseRat((pcb_rat_t *) ptr->Line); MoveObjectToRemoveUndoList(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line); } IncrementUndoSerialNumber(); Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4767) +++ trunk/src/data.c (revision 4768) @@ -198,7 +198,7 @@ } END_LOOP; list_map0(&data->Element, ElementType, RemoveFreeElement); - list_map0(&data->Rat, RatType, RemoveFreeRat); + list_map0(&data->Rat, pcb_rat_t, RemoveFreeRat); for (layer = data->Layer, i = 0; i < MAX_LAYER + 2; layer++, i++) { FreeAttributeListMemory(&layer->Attributes); Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4767) +++ trunk/src/draw.c (revision 4768) @@ -555,7 +555,7 @@ break; case PCB_TYPE_RATLINE: if (PCB->RatOn) - DrawRat((RatTypePtr) ptr2); + DrawRat((pcb_rat_t *) ptr2); break; case PCB_TYPE_PIN: if (PCB->PinOn) Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 4767) +++ trunk/src/find.c (revision 4768) @@ -104,7 +104,7 @@ (((pcb_arc_t **)ArcList[(L)].Data)[(I)]) #define RATLIST_ENTRY(I) \ - (((RatTypePtr *)RatList.Data)[(I)]) + (((pcb_rat_t **)RatList.Data)[(I)]) #define POLYGONLIST_ENTRY(L,I) \ (((PolygonTypePtr *)PolygonList[(L)].Data)[(I)]) Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 4767) +++ trunk/src/find_lookup.c (revision 4768) @@ -116,7 +116,7 @@ return pcb_false; } -static pcb_bool ADD_RAT_TO_LIST(RatTypePtr Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_RAT_TO_LIST(pcb_rat_t *Ptr, int from_type, void *from_ptr, found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_RATLINE, (Ptr), (Ptr), (Ptr)); @@ -280,7 +280,7 @@ PVList.Number = 0; /* Initialize ratline data */ RatList.Size = ratlist_length(&PCB->Data->Rat); - RatList.Data = (void **) calloc(RatList.Size, sizeof(RatTypePtr)); + RatList.Data = (void **) calloc(RatList.Size, sizeof(pcb_rat_t *)); RatList.Location = 0; RatList.DrawLocation = 0; RatList.Number = 0; @@ -330,7 +330,7 @@ static r_dir_t LOCtoPVrat_callback(const pcb_box_t * b, void *cl) { - RatTypePtr rat = (RatTypePtr) b; + pcb_rat_t *rat = (pcb_rat_t *) b; struct pv_info *i = (struct pv_info *) cl; if (!TEST_FLAG(TheFlag, rat) && IS_PV_ON_RAT(&i->pv, rat) && ADD_RAT_TO_LIST(rat, PCB_TYPE_PIN, &i->pv, FCT_RAT)) @@ -604,7 +604,7 @@ PadType pad; pcb_arc_t arc; PolygonType polygon; - RatType rat; + pcb_rat_t rat; jmp_buf env; }; @@ -945,7 +945,7 @@ static r_dir_t LOCtoLineRat_callback(const pcb_box_t * b, void *cl) { - RatTypePtr rat = (RatTypePtr) b; + pcb_rat_t *rat = (pcb_rat_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, rat)) { @@ -1174,7 +1174,7 @@ static r_dir_t LOCtoPadRat_callback(const pcb_box_t * b, void *cl) { - RatTypePtr rat = (RatTypePtr) b; + pcb_rat_t *rat = (pcb_rat_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, rat)) { @@ -1350,7 +1350,7 @@ static r_dir_t LOCtoPolyRat_callback(const pcb_box_t * b, void *cl) { - RatTypePtr rat = (RatTypePtr) b; + pcb_rat_t *rat = (pcb_rat_t *) b; struct lo_info *i = (struct lo_info *) cl; if (!TEST_FLAG(TheFlag, rat)) { Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4767) +++ trunk/src/find_misc.c (revision 4768) @@ -161,7 +161,7 @@ case PCB_TYPE_RATLINE: { - if (ADD_RAT_TO_LIST((RatTypePtr) ptr1, 0, NULL, FCT_START)) + if (ADD_RAT_TO_LIST((pcb_rat_t *) ptr1, 0, NULL, FCT_START)) return pcb_true; break; } Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 4767) +++ trunk/src/global_typedefs.h (revision 4768) @@ -37,7 +37,7 @@ typedef struct pcb_line_s pcb_line_t; typedef struct pcb_arc_s pcb_arc_t; typedef struct pcb_point_s pcb_point_t; -typedef struct pcb_rat_line_s RatType, *RatTypePtr; +typedef struct pcb_rat_line_s pcb_rat_t; typedef struct polygon_st PolygonType, *PolygonTypePtr; typedef struct pad_st PadType, *PadTypePtr; Index: trunk/src/obj_any.h =================================================================== --- trunk/src/obj_any.h (revision 4767) +++ trunk/src/obj_any.h (revision 4768) @@ -83,7 +83,7 @@ TextType *text; PolygonType *polygon; pcb_arc_t *arc; - RatType *rat; + pcb_rat_t *rat; PadType *pad; PinType *pin; PinType *via; Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4767) +++ trunk/src/obj_line.c (revision 4768) @@ -428,13 +428,13 @@ else { /* must be a rat */ if (PCB->RatOn) - EraseRat((RatTypePtr) Line); + EraseRat((pcb_rat_t *) Line); r_delete_entry(PCB->Data->rat_tree, &Line->BoundingBox); MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); SetLineBoundingBox(Line); r_insert_entry(PCB->Data->rat_tree, &Line->BoundingBox, 0); if (PCB->RatOn) { - DrawRat((RatTypePtr) Line); + DrawRat((pcb_rat_t *) Line); Draw(); } return (Line); @@ -663,7 +663,7 @@ } else { r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) Line, 0); - DrawRat((RatTypePtr) Line); + DrawRat((pcb_rat_t *) Line); } Draw(); return (Line); Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4767) +++ trunk/src/obj_rat.c (revision 4768) @@ -51,17 +51,17 @@ /*** allocation ***/ /* get next slot for a Rat, allocates memory if necessary */ -RatType *GetRatMemory(pcb_data_t *data) +pcb_rat_t *GetRatMemory(pcb_data_t *data) { - RatType *new_obj; + pcb_rat_t *new_obj; - new_obj = calloc(sizeof(RatType), 1); + new_obj = calloc(sizeof(pcb_rat_t), 1); ratlist_append(&data->Rat, new_obj); return new_obj; } -void RemoveFreeRat(RatType *data) +void RemoveFreeRat(pcb_rat_t *data) { ratlist_remove(data); free(data); @@ -69,9 +69,9 @@ /*** utility ***/ /* creates a new rat-line */ -RatTypePtr CreateNewRat(pcb_data_t *Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags) +pcb_rat_t *CreateNewRat(pcb_data_t *Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags) { - RatTypePtr Line = GetRatMemory(Data); + pcb_rat_t *Line = GetRatMemory(Data); if (!Line) return (Line); @@ -124,7 +124,7 @@ /*** ops ***/ /* copies a rat-line to paste buffer */ -void *AddRatToBuffer(pcb_opctx_t *ctx, RatTypePtr Rat) +void *AddRatToBuffer(pcb_opctx_t *ctx, pcb_rat_t *Rat) { return (CreateNewRat(ctx->buffer.dst, Rat->Point1.X, Rat->Point1.Y, Rat->Point2.X, Rat->Point2.Y, Rat->group1, Rat->group2, Rat->Thickness, @@ -132,7 +132,7 @@ } /* moves a rat-line to paste buffer */ -void *MoveRatToBuffer(pcb_opctx_t *ctx, RatType * rat) +void *MoveRatToBuffer(pcb_opctx_t *ctx, pcb_rat_t * rat) { r_delete_entry(ctx->buffer.src->rat_tree, (pcb_box_t *) rat); @@ -148,7 +148,7 @@ } /* inserts a point into a rat-line */ -void *InsertPointIntoRat(pcb_opctx_t *ctx, RatTypePtr Rat) +void *InsertPointIntoRat(pcb_opctx_t *ctx, pcb_rat_t *Rat) { pcb_line_t *newone; @@ -171,7 +171,7 @@ } /* moves a line between layers */ -void *MoveRatToLayer(pcb_opctx_t *ctx, RatType * Rat) +void *MoveRatToLayer(pcb_opctx_t *ctx, pcb_rat_t * Rat) { pcb_line_t *newone; /*Coord X1 = Rat->Point1.X, Y1 = Rat->Point1.Y; @@ -197,7 +197,7 @@ } /* destroys a rat */ -void *DestroyRat(pcb_opctx_t *ctx, RatTypePtr Rat) +void *DestroyRat(pcb_opctx_t *ctx, pcb_rat_t *Rat) { if (ctx->remove.destroy_target->rat_tree) r_delete_entry(ctx->remove.destroy_target->rat_tree, &Rat->BoundingBox); @@ -207,7 +207,7 @@ } /* removes a rat */ -void *RemoveRat(pcb_opctx_t *ctx, RatTypePtr Rat) +void *RemoveRat(pcb_opctx_t *ctx, pcb_rat_t *Rat) { /* erase from screen and memory */ if (PCB->RatOn) { @@ -222,7 +222,7 @@ /*** draw ***/ r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl) { - RatType *rat = (RatType *) b; + pcb_rat_t *rat = (pcb_rat_t *) b; if (TEST_FLAG(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, rat)) { if (TEST_FLAG(PCB_FLAG_SELECTED, rat)) @@ -250,7 +250,7 @@ return R_DIR_FOUND_CONTINUE; } -void EraseRat(RatTypePtr Rat) +void EraseRat(pcb_rat_t *Rat) { if (TEST_FLAG(PCB_FLAG_VIA, Rat)) { Coord w = Rat->Thickness; @@ -268,7 +268,7 @@ EraseFlags(&Rat->Flags); } -void DrawRat(RatTypePtr Rat) +void DrawRat(pcb_rat_t *Rat) { if (conf_core.appearance.rat_thickness < 20) Rat->Thickness = pixel_slop * conf_core.appearance.rat_thickness; Index: trunk/src/obj_rat.h =================================================================== --- trunk/src/obj_rat.h (revision 4767) +++ trunk/src/obj_rat.h (revision 4768) @@ -38,10 +38,10 @@ }; -RatType *GetRatMemory(pcb_data_t *data); -void RemoveFreeRat(RatType *data); +pcb_rat_t *GetRatMemory(pcb_data_t *data); +void RemoveFreeRat(pcb_rat_t *data); -RatTypePtr CreateNewRat(pcb_data_t *Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags); +pcb_rat_t *CreateNewRat(pcb_data_t *Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags); pcb_bool DeleteRats(pcb_bool selected); #endif Index: trunk/src/obj_rat_draw.h =================================================================== --- trunk/src/obj_rat_draw.h (revision 4767) +++ trunk/src/obj_rat_draw.h (revision 4768) @@ -31,5 +31,5 @@ r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl); #endif -void EraseRat(RatTypePtr Rat); -void DrawRat(RatTypePtr Rat); +void EraseRat(pcb_rat_t *Rat); +void DrawRat(pcb_rat_t *Rat); Index: trunk/src/obj_rat_list.h =================================================================== --- trunk/src/obj_rat_list.h (revision 4767) +++ trunk/src/obj_rat_list.h (revision 4768) @@ -28,7 +28,7 @@ /* List of Rats */ #define TDL(x) ratlist_ ## x #define TDL_LIST_T ratlist_t -#define TDL_ITEM_T RatType +#define TDL_ITEM_T pcb_rat_t #define TDL_FIELD link #define TDL_SIZE_T size_t #define TDL_FUNC Index: trunk/src/obj_rat_op.h =================================================================== --- trunk/src/obj_rat_op.h (revision 4767) +++ trunk/src/obj_rat_op.h (revision 4768) @@ -28,9 +28,9 @@ #include "operation.h" -void *AddRatToBuffer(pcb_opctx_t *ctx, RatTypePtr Rat); -void *MoveRatToBuffer(pcb_opctx_t *ctx, RatType * rat); -void *InsertPointIntoRat(pcb_opctx_t *ctx, RatTypePtr Rat); -void *MoveRatToLayer(pcb_opctx_t *ctx, RatType * Rat); -void *DestroyRat(pcb_opctx_t *ctx, RatTypePtr Rat); -void *RemoveRat(pcb_opctx_t *ctx, RatTypePtr Rat); +void *AddRatToBuffer(pcb_opctx_t *ctx, pcb_rat_t *Rat); +void *MoveRatToBuffer(pcb_opctx_t *ctx, pcb_rat_t * rat); +void *InsertPointIntoRat(pcb_opctx_t *ctx, pcb_rat_t *Rat); +void *MoveRatToLayer(pcb_opctx_t *ctx, pcb_rat_t * Rat); +void *DestroyRat(pcb_opctx_t *ctx, pcb_rat_t *Rat); +void *RemoveRat(pcb_opctx_t *ctx, pcb_rat_t *Rat); Index: trunk/src/operation.h =================================================================== --- trunk/src/operation.h (revision 4767) +++ trunk/src/operation.h (revision 4768) @@ -121,7 +121,7 @@ void *(*LinePoint)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *, pcb_point_t *); void *(*Point)(pcb_opctx_t *ctx, pcb_layer_t *, PolygonTypePtr, pcb_point_t *); void *(*Arc)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_arc_t *); - void *(*Rat)(pcb_opctx_t *ctx, RatTypePtr); + void *(*Rat)(pcb_opctx_t *ctx, pcb_rat_t *); } pcb_opfunc_t; #endif Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4767) +++ trunk/src/rats.c (revision 4768) @@ -494,7 +494,7 @@ DrawShortestRats(NetListTypePtr Netl, void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)) { - RatTypePtr line; + pcb_rat_t *line; register float distance, temp; register pcb_connection_t *conn1, *conn2, *firstpoint, *secondpoint; PolygonTypePtr polygon; @@ -807,7 +807,7 @@ /* These next two functions moved from the original netlist.c as part of the | gui code separation for the Gtk port. */ -RatTypePtr AddNet(void) +pcb_rat_t *AddNet(void) { static int ratDrawn = 0; char name1[256], *name2; Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 4767) +++ trunk/src/rats.h (revision 4768) @@ -47,7 +47,7 @@ LibraryMenuType *menu; /* the netmenu this *SHOULD* belong too */ }; -RatTypePtr AddNet(void); +pcb_rat_t *AddNet(void); char *ConnectionName(int, void *, void *); pcb_bool AddAllRats(pcb_bool, void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)); @@ -65,7 +65,7 @@ connection = & (net)->Connection[n] #define RAT_LOOP(top) do { \ - RatType *line; \ + pcb_rat_t *line; \ gdl_iterator_t __it__; \ ratlist_foreach(&(top)->Rat, &__it__, line) { Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 4767) +++ trunk/src/rats_act.c (revision 4768) @@ -72,7 +72,7 @@ static int ActionAddRats(int argc, const char **argv, Coord x, Coord y) { const char *function = ACTION_ARG(0); - RatTypePtr shorty; + pcb_rat_t *shorty; float len, small; if (function) { Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 4767) +++ trunk/src/rotate.c (revision 4768) @@ -129,7 +129,7 @@ } else { r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) ptr->Line, 0); - DrawRat((RatTypePtr) ptr->Line); + DrawRat((pcb_rat_t *) ptr->Line); } Crosshair.AttachedObject.RubberbandN--; ptr++; Index: trunk/src/rubberband.c =================================================================== --- trunk/src/rubberband.c (revision 4767) +++ trunk/src/rubberband.c (revision 4768) @@ -212,7 +212,7 @@ static r_dir_t rat_callback(const pcb_box_t * box, void *cl) { - RatTypePtr rat = (RatTypePtr) box; + pcb_rat_t *rat = (pcb_rat_t *) box; struct rinfo *i = (struct rinfo *) cl; switch (i->type) { Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 4767) +++ trunk/src/search.c (revision 4768) @@ -55,7 +55,7 @@ */ static pcb_bool SearchLineByLocation(int, pcb_layer_t **, pcb_line_t **, pcb_line_t **); static pcb_bool SearchArcByLocation(int, pcb_layer_t **, pcb_arc_t **, pcb_arc_t **); -static pcb_bool SearchRatLineByLocation(int, RatTypePtr *, RatTypePtr *, RatTypePtr *); +static pcb_bool SearchRatLineByLocation(int, pcb_rat_t **, pcb_rat_t **, pcb_rat_t **); static pcb_bool SearchTextByLocation(int, pcb_layer_t **, TextTypePtr *, TextTypePtr *); static pcb_bool SearchPolygonByLocation(int, pcb_layer_t **, PolygonTypePtr *, PolygonTypePtr *); static pcb_bool SearchPinByLocation(int, ElementTypePtr *, PinTypePtr *, PinTypePtr *); @@ -234,7 +234,7 @@ /* --------------------------------------------------------------------------- * searches rat lines if they are visible */ -static pcb_bool SearchRatLineByLocation(int locked, RatTypePtr * Line, RatTypePtr * Dummy1, RatTypePtr * Dummy2) +static pcb_bool SearchRatLineByLocation(int locked, pcb_rat_t ** Line, pcb_rat_t ** Dummy1, pcb_rat_t ** Dummy2) { struct ans_info info; @@ -543,7 +543,7 @@ /* --------------------------------------------------------------------------- * checks if a rat-line end is on a PV */ -pcb_bool IsPointOnLineEnd(Coord X, Coord Y, RatTypePtr Line) +pcb_bool IsPointOnLineEnd(Coord X, Coord Y, pcb_rat_t *Line) { if (((X == Line->Point1.X) && (Y == Line->Point1.Y)) || ((X == Line->Point2.X) && (Y == Line->Point2.Y))) return (pcb_true); @@ -997,7 +997,7 @@ } if (Type & PCB_TYPE_RATLINE && PCB->RatOn && - SearchRatLineByLocation(locked, (RatTypePtr *) Result1, (RatTypePtr *) Result2, (RatTypePtr *) Result3)) + SearchRatLineByLocation(locked, (pcb_rat_t **) Result1, (pcb_rat_t **) Result2, (pcb_rat_t **) Result3)) return (PCB_TYPE_RATLINE); if (Type & PCB_TYPE_VIA && SearchViaByLocation(locked, (PinTypePtr *) Result1, (PinTypePtr *) Result2, (PinTypePtr *) Result3)) Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 4767) +++ trunk/src/search.h (revision 4768) @@ -148,7 +148,7 @@ pcb_bool IsPointOnLine(Coord, Coord, Coord, pcb_line_t *); pcb_bool IsPointOnPin(Coord, Coord, Coord, PinTypePtr); pcb_bool IsPointOnArc(Coord, Coord, Coord, pcb_arc_t *); -pcb_bool IsPointOnLineEnd(Coord, Coord, RatTypePtr); +pcb_bool IsPointOnLineEnd(Coord, Coord, pcb_rat_t *); pcb_bool IsLineInRectangle(Coord, Coord, Coord, Coord, pcb_line_t *); pcb_bool IsLineInQuadrangle(pcb_point_t p[4], pcb_line_t *Line); pcb_bool IsArcInRectangle(Coord, Coord, Coord, Coord, pcb_arc_t *); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4767) +++ trunk/src/select.c (revision 4768) @@ -138,7 +138,7 @@ case PCB_TYPE_RATLINE: { - RatTypePtr rat = (RatTypePtr) ptr2; + pcb_rat_t *rat = (pcb_rat_t *) ptr2; AddObjectToFlagUndoList(PCB_TYPE_RATLINE, ptr1, ptr1, ptr1); TOGGLE_FLAG(PCB_FLAG_SELECTED, rat); @@ -544,7 +544,7 @@ case PCB_TYPE_RATLINE: if (F->Rat) - return (F->Rat(ctx, (RatTypePtr) Ptr1)); + return (F->Rat(ctx, (pcb_rat_t *) Ptr1)); break; } return (NULL); Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4767) +++ trunk/src_plugins/io_lihata/read.c (revision 4768) @@ -379,7 +379,7 @@ static int parse_rat(pcb_data_t *dt, lht_node_t *obj) { - RatType rat, *new_rat; + pcb_rat_t rat, *new_rat; parse_id(&rat.ID, obj, 4); parse_attributes(&rat.Attributes, lht_dom_hash_get(obj, "attributes")); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4767) +++ trunk/src_plugins/io_lihata/write.c (revision 4768) @@ -232,7 +232,7 @@ return obj; } -static lht_node_t *build_rat(RatType *rat) +static lht_node_t *build_rat(pcb_rat_t *rat) { char buff[128]; lht_node_t *obj; @@ -487,7 +487,7 @@ PinType *pi; ElementType *el; gdl_iterator_t it; - RatType *line; + pcb_rat_t *line; ndt = lht_dom_node_alloc(LHT_HASH, "data"); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4767) +++ trunk/src_plugins/io_pcb/file.c (revision 4768) @@ -312,7 +312,7 @@ static void WritePCBRatData(FILE * FP) { gdl_iterator_t it; - RatType *line; + pcb_rat_t *line; /* write information about rats */ ratlist_foreach(&PCB->Data->Rat, &it, line) { Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4767) +++ trunk/src_plugins/report/report.c (revision 4768) @@ -244,7 +244,7 @@ } case PCB_TYPE_RATLINE: { - RatTypePtr line; + pcb_rat_t *line; #ifndef NDEBUG if (gui->shift_is_pressed()) { __r_dump_tree(PCB->Data->rat_tree->root, 0); @@ -251,7 +251,7 @@ return 0; } #endif - line = (RatTypePtr) ptr2; + line = (pcb_rat_t *) ptr2; report = pcb_strdup_printf("%m+RAT-LINE ID# %ld; Flags:%s\n" "FirstPoint(X,Y) = %$mD; ID = %ld; " "connects to layer group %d.\n" Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4767) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4768) @@ -7011,7 +7011,7 @@ g_list_free(destvertices); }*/ -toporouter_route_t *import_route(toporouter_t * r, RatType * line) +toporouter_route_t *import_route(toporouter_t * r, pcb_rat_t * line) { toporouter_route_t *routedata = routedata_create();