Index: obj_rat.c =================================================================== --- obj_rat.c (revision 30902) +++ obj_rat.c (revision 30903) @@ -92,7 +92,7 @@ /*** utility ***/ /* creates a new rat-line */ -pcb_rat_t *pcb_rat_new(pcb_data_t *Data, long int id, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_layergrp_id_t group1, pcb_layergrp_id_t group2, pcb_coord_t Thickness, pcb_flag_t Flags, pcb_any_obj_t *anchor1, pcb_any_obj_t *anchor2) +pcb_rat_t *pcb_rat_new(pcb_data_t *Data, long int id, rnd_coord_t X1, rnd_coord_t Y1, rnd_coord_t X2, rnd_coord_t Y2, pcb_layergrp_id_t group1, pcb_layergrp_id_t group2, rnd_coord_t Thickness, pcb_flag_t Flags, pcb_any_obj_t *anchor1, pcb_any_obj_t *anchor2) { pcb_rat_t *Line; @@ -129,10 +129,10 @@ /* DeleteRats - deletes rat lines only * can delete all rat lines, or only selected one */ -pcb_bool pcb_rats_destroy(pcb_bool selected) +rnd_bool pcb_rats_destroy(rnd_bool selected) { pcb_opctx_t ctx; - pcb_bool changed = pcb_false; + rnd_bool changed = pcb_false; ctx.remove.pcb = PCB; ctx.remove.destroy_target = NULL; @@ -152,7 +152,7 @@ /*** utility ***/ -static pcb_bool rat_meets_line(pcb_line_t *line, pcb_coord_t x, pcb_coord_t y, pcb_layergrp_id_t gid) +static rnd_bool rat_meets_line(pcb_line_t *line, rnd_coord_t x, rnd_coord_t y, pcb_layergrp_id_t gid) { if (gid >= 0) { pcb_layer_t *ly = pcb_layer_get_real(line->parent.layer); @@ -165,7 +165,7 @@ } -static pcb_bool rat_meets_arc(pcb_arc_t *arc, pcb_coord_t x, pcb_coord_t y, pcb_layergrp_id_t gid) +static rnd_bool rat_meets_arc(pcb_arc_t *arc, rnd_coord_t x, rnd_coord_t y, pcb_layergrp_id_t gid) { if (gid >= 0) { pcb_layer_t *ly = pcb_layer_get_real(arc->parent.layer); @@ -176,7 +176,7 @@ } -static pcb_bool rat_meets_poly(pcb_poly_t *poly, pcb_coord_t x, pcb_coord_t y, pcb_layergrp_id_t gid) +static rnd_bool rat_meets_poly(pcb_poly_t *poly, rnd_coord_t x, rnd_coord_t y, pcb_layergrp_id_t gid) { if (gid >= 0) { pcb_layer_t *ly = pcb_layer_get_real(poly->parent.layer); @@ -188,7 +188,7 @@ return pcb_poly_is_point_in_p(x, y, 1, poly); } -static pcb_bool rat_meets_pstk(pcb_data_t *data, pcb_pstk_t *pstk, pcb_coord_t x, pcb_coord_t y, pcb_layergrp_id_t gid) +static rnd_bool rat_meets_pstk(pcb_data_t *data, pcb_pstk_t *pstk, rnd_coord_t x, rnd_coord_t y, pcb_layergrp_id_t gid) { pcb_layergrp_t *g = pcb_get_layergrp(PCB, gid); pcb_layer_t *ly; @@ -210,7 +210,7 @@ /* return the first object (the type that is most likely an endpoint of a rat) on a point on a layer */ -static pcb_any_obj_t *find_obj_on_layer(pcb_coord_t x, pcb_coord_t y, pcb_layer_t *l) +static pcb_any_obj_t *find_obj_on_layer(rnd_coord_t x, rnd_coord_t y, pcb_layer_t *l) { pcb_rtree_it_t it; pcb_box_t *n; @@ -267,7 +267,7 @@ /* return the first object (the type that is most likely an endpoint of a rat) on a point on a layer group */ -static pcb_any_obj_t *find_obj_on_grp(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_layergrp_id_t gid) +static pcb_any_obj_t *find_obj_on_grp(pcb_data_t *data, rnd_coord_t x, rnd_coord_t y, pcb_layergrp_id_t gid) { int i; pcb_rtree_box_t sb; @@ -299,12 +299,12 @@ return NULL; } -pcb_any_obj_t *pcb_rat_anchor_guess(pcb_rat_t *rat, int end, pcb_bool update) +pcb_any_obj_t *pcb_rat_anchor_guess(pcb_rat_t *rat, int end, rnd_bool update) { pcb_data_t *data = rat->parent.data; pcb_idpath_t **path = &rat->anchor[!!end]; - pcb_coord_t x = (end == 0) ? rat->Point1.X : rat->Point2.X; - pcb_coord_t y = (end == 0) ? rat->Point1.Y : rat->Point2.Y; + rnd_coord_t x = (end == 0) ? rat->Point1.X : rat->Point2.X; + rnd_coord_t y = (end == 0) ? rat->Point1.Y : rat->Point2.Y; pcb_layergrp_id_t gid = (end == 0) ? rat->group1 : rat->group2; pcb_any_obj_t *ao; @@ -478,7 +478,7 @@ void pcb_rat_invalidate_erase(pcb_rat_t *Rat) { if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) { - pcb_coord_t w = Rat->Thickness; + rnd_coord_t w = Rat->Thickness; pcb_box_t b; @@ -499,7 +499,7 @@ Rat->Thickness = pcb_pixel_slop * conf_core.appearance.rat_thickness; /* rats.c set PCB_FLAG_VIA if this rat goes to a containing poly: draw a donut */ if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) { - pcb_coord_t w = Rat->Thickness; + rnd_coord_t w = Rat->Thickness; pcb_box_t b;