Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 5500) +++ trunk/src/buffer.c (revision 5501) @@ -431,7 +431,7 @@ void pcb_buffer_flip_side(pcb_buffer_t *Buffer) { int j, k; - pcb_cardinal_t sgroup, cgroup; + pcb_layergrp_id_t sgroup, cgroup; pcb_layer_t swap; PCB_ELEMENT_LOOP(Buffer->Data); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5500) +++ trunk/src/crosshair.c (revision 5501) @@ -1017,8 +1017,8 @@ (conf_core.editor.mode == PCB_MODE_LINE || (conf_core.editor.mode == PCB_MODE_MOVE && pcb_crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT))) { pcb_pad_t *pad = (pcb_pad_t *) ptr2; pcb_layer_t *desired_layer; - pcb_cardinal_t desired_group; - pcb_cardinal_t SLayer, CLayer; + pcb_layergrp_id_t desired_group; + pcb_layergrp_id_t SLayer, CLayer; int found_our_layer = pcb_false; desired_layer = CURRENT; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 5500) +++ trunk/src/draw.c (revision 5501) @@ -140,7 +140,7 @@ */ static void PrintAssembly(int side, const pcb_box_t * drawn_area) { - int side_group = pcb_layer_get_group(pcb_max_copper_layer + side); + pcb_layergrp_id_t side_group = pcb_layer_get_group(pcb_max_copper_layer + side); pcb_draw_doing_assy = pcb_true; pcb_gui->set_draw_faded(Output.fgGC, 1); @@ -174,7 +174,7 @@ static void DrawEverything(const pcb_box_t * drawn_area) { int i, ngroups, side; - int component, solder; + pcb_layergrp_id_t component, solder; /* This is the list of layer groups we will draw. */ int do_group[PCB_MAX_LAYERGRP]; /* This is the reverse of the order in which we draw them. */ @@ -188,7 +188,7 @@ memset(do_group, 0, sizeof(do_group)); for (ngroups = 0, i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *l = LAYER_ON_STACK(i); - int group = pcb_layer_get_group(pcb_layer_stack[i]); + pcb_layergrp_id_t group = pcb_layer_get_group(pcb_layer_stack[i]); if (l->On && !do_group[group]) { do_group[group] = 1; drawn_groups[ngroups++] = group; @@ -301,8 +301,8 @@ */ static void DrawPPV(int group, const pcb_box_t * drawn_area) { - int component_group = pcb_layer_get_group(pcb_component_silk_layer); - int solder_group = pcb_layer_get_group(pcb_solder_silk_layer); + pcb_layergrp_id_t component_group = pcb_layer_get_group(pcb_component_silk_layer); + pcb_layergrp_id_t solder_group = pcb_layer_get_group(pcb_solder_silk_layer); int side; if (PCB->PinOn || !pcb_gui->gui) { Index: trunk/src/hid_helper.c =================================================================== --- trunk/src/hid_helper.c (revision 5500) +++ trunk/src/hid_helper.c (revision 5501) @@ -34,7 +34,7 @@ const char *pcb_layer_type_to_file_name(int idx, int style) { - int group; + pcb_layergrp_id_t group; int nlayers; const char *single_name; @@ -85,7 +85,7 @@ static char buf[20]; if (style == PCB_FNS_first || (style == PCB_FNS_single && nlayers == 1)) return single_name; - sprintf(buf, "group%d", group); + sprintf(buf, "group%ld", group); return buf; } break; Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 5500) +++ trunk/src/layer.c (revision 5501) @@ -730,8 +730,8 @@ static int LastLayerInComponentGroup(int layer) { - int cgroup = pcb_layer_get_group(pcb_max_group + PCB_COMPONENT_SIDE); - int lgroup = pcb_layer_get_group(layer); + pcb_layergrp_id_t cgroup = pcb_layer_get_group(pcb_max_group + PCB_COMPONENT_SIDE); + pcb_layergrp_id_t lgroup = pcb_layer_get_group(layer); if (cgroup == lgroup && PCB->LayerGroups.Number[lgroup] == 2) return 1; return 0; Index: trunk/src/layer_vis.c =================================================================== --- trunk/src/layer_vis.c (revision 5500) +++ trunk/src/layer_vis.c (revision 5501) @@ -167,7 +167,8 @@ */ int pcb_layervis_change_group_vis(int Layer, pcb_bool On, pcb_bool ChangeStackOrder) { - int group, i, changed = 1; /* at least the current layer changes */ + pcb_layergrp_id_t group; + int i, changed = 1; /* at least the current layer changes */ /* Warning: these special case values must agree with what gui-top-window.c | thinks the are. @@ -208,7 +209,7 @@ */ void pcb_layervis_reset_stack(void) { - int comp_group; + pcb_layergrp_id_t comp_group; pcb_cardinal_t i; assert(PCB->Data->LayerN <= PCB_MAX_LAYER); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 5500) +++ trunk/src/obj_elem.c (revision 5501) @@ -161,7 +161,7 @@ pcb_bool pcb_element_smash_buffer(pcb_buffer_t *Buffer) { pcb_element_t *element; - pcb_cardinal_t group; + pcb_layergrp_id_t group; pcb_layer_t *clayer, *slayer; if (elementlist_length(&Buffer->Data->Element) != 1) { @@ -256,7 +256,7 @@ pcb_bool pcb_element_convert_from_buffer(pcb_buffer_t *Buffer) { pcb_element_t *Element; - pcb_cardinal_t group; + pcb_layergrp_id_t group; pcb_cardinal_t pin_n = 1; pcb_bool hasParts = pcb_false, crooked = pcb_false; int onsolder; Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 5500) +++ trunk/src/obj_line_drcenf.c (revision 5501) @@ -254,7 +254,7 @@ pcb_coord_t dx, dy, temp, last, length; pcb_coord_t temp2, last2, length2; pcb_line_t line1, line2; - pcb_cardinal_t group, comp; + pcb_layergrp_id_t group, comp; struct drc_info info; pcb_bool two_lines, x_is_long, blocker; pcb_point_t ans; @@ -412,7 +412,7 @@ static void drc_line(pcb_point_t *end) { struct drc_info info; - pcb_cardinal_t group, comp; + pcb_layergrp_id_t group, comp; pcb_line_t line; pcb_attached_line_t aline; static pcb_point_t last_good; /* internal state of last good endpoint - we cna do thsi cheat, because... */ Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 5500) +++ trunk/src/polygon.c (revision 5501) @@ -1512,7 +1512,7 @@ break; case PCB_TYPE_PAD: { - pcb_cardinal_t group = pcb_layer_get_group(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? + pcb_layergrp_id_t group = pcb_layer_get_group(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? pcb_solder_silk_layer : pcb_component_silk_layer); GROUP_LOOP(Data, group); { Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 5500) +++ trunk/src/rats.c (revision 5501) @@ -68,7 +68,7 @@ * some local identifiers */ static pcb_bool badnet = pcb_false; -static pcb_cardinal_t SLayer, CLayer; /* layer group holding solder/component side */ +static pcb_layergrp_id_t SLayer, CLayer; /* layer group holding solder/component side */ /* --------------------------------------------------------------------------- * parse a connection description from a string Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 5500) +++ trunk/src/rats.h (revision 5501) @@ -33,6 +33,7 @@ #include "config.h" #include "netlist.h" +#include "layer.h" /* --------------------------------------------------------------------------- * structure used by device drivers @@ -43,7 +44,7 @@ pcb_coord_t X, Y; /* coordinate of connection */ long int type; /* type of object in ptr1 - 3 */ void *ptr1, *ptr2; /* the object of the connection */ - pcb_cardinal_t group; /* the layer group of the connection */ + pcb_layergrp_id_t group; /* the layer group of the connection */ pcb_lib_menu_t *menu; /* the netmenu this *SHOULD* belong too */ }; Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 5500) +++ trunk/src_plugins/autoplace/autoplace.c (revision 5501) @@ -141,7 +141,7 @@ */ static void UpdateXY(pcb_netlist_t *Nets) { - pcb_cardinal_t SLayer, CLayer; + pcb_layergrp_id_t SLayer, CLayer; pcb_cardinal_t i, j; /* find layer groups of the component side and solder side */ SLayer = pcb_layer_get_group(pcb_solder_silk_layer); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 5500) +++ trunk/src_plugins/autoroute/autoroute.c (revision 5501) @@ -399,7 +399,7 @@ * some local identifiers */ /* group number of groups that hold surface mount pads */ -static pcb_cardinal_t front, back; +static pcb_layergrp_id_t front, back; static pcb_bool usedGroup[PCB_MAX_LAYERGRP]; static int x_cost[PCB_MAX_LAYERGRP], y_cost[PCB_MAX_LAYERGRP]; static pcb_bool is_layer_group_active[PCB_MAX_LAYERGRP]; @@ -728,7 +728,7 @@ static routebox_t *AddPolygon(vtptr_t layergroupboxes[], pcb_cardinal_t layer, pcb_polygon_t *polygon, pcb_route_style_t * style) { int is_not_rectangle = 1; - int layergroup = pcb_layer_get_group(layer); + pcb_layergrp_id_t layergroup = pcb_layer_get_group(layer); routebox_t *rb; assert(0 <= layergroup && layergroup < pcb_max_group); rb = AddIrregularObstacle(layergroupboxes, @@ -1064,7 +1064,7 @@ PCB_END_LOOP; for (i = 0; i < pcb_max_copper_layer; i++) { - int layergroup = pcb_layer_get_group(i); + pcb_layergrp_id_t layergroup = pcb_layer_get_group(i); /* add all (non-rat) lines */ PCB_LINE_LOOP(LAYER_PTR(i)); { Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 5500) +++ trunk/src_plugins/export_dxf/dxf.c (revision 5501) @@ -253,7 +253,7 @@ static void dxf_fill_polygon(pcb_hid_gc_t gc, int n_coords, int *x, int *y); static void dxf_fill_rect(pcb_hid_gc_t gc, int x1, int y1, int x2, int y2); static pcb_hid_attribute_t *dxf_get_export_options(int *n); -static int dxf_group_for_layer(int l); +static pcb_layergrp_id_t dxf_group_for_layer(int l); static DxfList *dxf_insert(char *refdes, char *descr, char *value, DxfList * dxf); static int dxf_layer_sort(const void *va, const void *vb); static pcb_hid_gc_t dxf_make_gc(void); @@ -745,7 +745,7 @@ /*! * \brief Find a group for a given layer ??. */ -static int dxf_group_for_layer(int l) { +static pcb_layergrp_id_t dxf_group_for_layer(int l) { if ((l < pcb_max_copper_layer + 2) && (l >= 0)) { return pcb_layer_get_group(l); } Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 5500) +++ trunk/src_plugins/export_gerber/gerber.c (revision 5501) @@ -362,7 +362,7 @@ return gerber_options; } -static int group_for_layer(int l) +static pcb_layergrp_id_t group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) return pcb_layer_get_group(l); @@ -397,7 +397,7 @@ three-character suffix compatible with Eagle's defaults. */ static void assign_eagle_file_suffix(char *dest, int idx) { - int group; + pcb_layergrp_id_t group; int nlayers; const char *suff = "out"; @@ -454,7 +454,7 @@ } else { static char buf[20]; - sprintf(buf, "ly%d", group); + sprintf(buf, "ly%ld", group); suff = buf; } break; Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 5500) +++ trunk/src_plugins/export_png/png.c (revision 5501) @@ -379,9 +379,9 @@ return png_attribute_list; } -static int comp_layer, solder_layer; +static pcb_layergrp_id_t comp_layer, solder_layer; -static int group_for_layer(int l) +static pcb_layergrp_id_t group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) return pcb_layer_get_group(l); Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 5500) +++ trunk/src_plugins/export_ps/eps.c (revision 5501) @@ -147,7 +147,7 @@ static int comp_layer, solder_layer; -static int group_for_layer(int l) +static pcb_layergrp_id_t group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) return pcb_layer_get_group(l); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 5500) +++ trunk/src_plugins/export_ps/ps.c (revision 5501) @@ -428,7 +428,7 @@ return ps_attribute_list; } -static int group_for_layer(int l) +static pcb_layergrp_id_t group_for_layer(int l) { if (l < pcb_max_copper_layer + 2 && l >= 0) return pcb_layer_get_group(l); Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 5500) +++ trunk/src_plugins/export_stat/stat.c (revision 5501) @@ -122,7 +122,8 @@ { FILE *f; const char *filename; - int i, lid, lgid; + int i, lid; + pcb_layergrp_id_t lgid; char buff[1024]; time_t t; layer_stat_t ls, *lgs, lgss[PCB_MAX_LAYERGRP]; @@ -177,7 +178,7 @@ fprintf(f, " ha:layer_%d {\n", lid); fprintf(f, " name={%s}\n", l->Name); fprintf(f, " empty=%s\n", empty ? "yes" : "no"); - fprintf(f, " grp=%d\n", lgid); + fprintf(f, " grp=%ld\n", lgid); memset(&ls, 0, sizeof(ls)); @@ -236,7 +237,7 @@ for(lgid = 0; lgid < pcb_max_copper_layer; lgid++) { if (group_not_empty[lgid]) { phg++; - fprintf(f, " ha:layergroup_%d {\n", lgid); + fprintf(f, " ha:layergroup_%ld {\n", lgid); fprintf(f, " lines=%lu\n", lgss[lgid].lines); fprintf(f, " arcs=%lu\n", lgss[lgid].arcs); fprintf(f, " polys=%lu\n", lgss[lgid].polys); Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 5500) +++ trunk/src_plugins/hid_batch/batch.c (revision 5501) @@ -76,7 +76,7 @@ static int info(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { int i, j; - int cg, sg; + pcb_layergrp_id_t cg, sg; if (!PCB || !PCB->Data || !PCB->Filename) { printf("No PCB loaded.\n"); return 0; @@ -87,7 +87,7 @@ sg = pcb_layer_get_group(pcb_solder_silk_layer); for (i = 0; i < PCB_MAX_LAYER; i++) { - int lg = pcb_layer_get_group(i); + pcb_layergrp_id_t lg = pcb_layer_get_group(i); for (j = 0; j < PCB_MAX_LAYER; j++) putchar(j == lg ? '#' : '-'); printf(" %c %s\n", lg == cg ? 'c' : lg == sg ? 's' : '-', PCB->Data->Layer[i].Name); Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5500) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5501) @@ -1337,9 +1337,9 @@ static int SwapSides(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { - int active_group = pcb_layer_get_group(pcb_layer_stack[0]); - int comp_group = pcb_layer_get_group(pcb_component_silk_layer); - int solder_group = pcb_layer_get_group(pcb_solder_silk_layer); + pcb_layergrp_id_t active_group = pcb_layer_get_group(pcb_layer_stack[0]); + pcb_layergrp_id_t comp_group = pcb_layer_get_group(pcb_component_silk_layer); + pcb_layergrp_id_t solder_group = pcb_layer_get_group(pcb_solder_silk_layer); pcb_bool comp_on = LAYER_PTR(PCB->LayerGroups.Entries[comp_group][0])->On; pcb_bool solder_on = LAYER_PTR(PCB->LayerGroups.Entries[solder_group][0])->On; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 5500) +++ trunk/src_plugins/hid_lesstif/main.c (revision 5501) @@ -571,9 +571,9 @@ static int SwapSides(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { int old_shown_side = conf_core.editor.show_solder_side; - int comp_group = pcb_layer_get_group(pcb_component_silk_layer); - int solder_group = pcb_layer_get_group(pcb_solder_silk_layer); - int active_group = pcb_layer_get_group(pcb_layer_stack[0]); + pcb_layergrp_id_t comp_group = pcb_layer_get_group(pcb_component_silk_layer); + pcb_layergrp_id_t solder_group = pcb_layer_get_group(pcb_solder_silk_layer); + pcb_layergrp_id_t active_group = pcb_layer_get_group(pcb_layer_stack[0]); int comp_layer; int solder_layer; int comp_showing = group_showing(comp_group, &comp_layer); Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 5500) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 5501) @@ -254,7 +254,7 @@ show_one_layer_button(layer, set); if (layer < pcb_max_copper_layer) { int i; - int group = pcb_layer_get_group(layer); + pcb_layergrp_id_t group = pcb_layer_get_group(layer); for (i = 0; i < PCB->LayerGroups.Number[group]; i++) { l = PCB->LayerGroups.Entries[group][i]; if (l != layer && l < pcb_max_copper_layer) { Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 5500) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 5501) @@ -215,7 +215,7 @@ static void CheckPadForRubberbandConnection(rubber_ctx_t *rbnd, pcb_pad_t *Pad) { pcb_coord_t half = Pad->Thickness / 2; - pcb_cardinal_t i, group; + pcb_layergrp_id_t i, group; struct rubber_info info; info.box.X1 = MIN(Pad->Point1.X, Pad->Point2.X) - half; @@ -242,7 +242,7 @@ struct rinfo { int type; - pcb_cardinal_t group; + pcb_layergrp_id_t group; pcb_pin_t *pin; pcb_pad_t *pad; pcb_point_t *point; @@ -369,7 +369,7 @@ */ static void CheckLinePointForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *LinePoint, pcb_bool Exact) { - pcb_cardinal_t group; + pcb_layergrp_id_t group; struct rubber_info info; pcb_coord_t t = Line->Thickness / 2; @@ -403,7 +403,7 @@ */ static void CheckArcPointForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_arc_t *Arc, int *end_pt, pcb_bool Exact) { - pcb_cardinal_t group; + pcb_layergrp_id_t group; struct rubber_info info; pcb_coord_t t = Arc->Thickness / 2, ex, ey; @@ -439,7 +439,7 @@ */ static void CheckPolygonForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { - pcb_cardinal_t group; + pcb_layergrp_id_t group; /* lookup layergroup and check all visible lines in this group */ group = pcb_layer_get_group_(Layer); Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 5500) +++ trunk/src_plugins/toporouter/toporouter.c (revision 5501) @@ -1804,8 +1804,8 @@ GList *vlist = NULL; toporouter_bbox_t *bbox = NULL; - guint front = pcb_layer_get_group(pcb_component_silk_layer); - guint back = pcb_layer_get_group(pcb_solder_silk_layer); + pcb_layergrp_id_t front = pcb_layer_get_group(pcb_component_silk_layer); + pcb_layergrp_id_t back = pcb_layer_get_group(pcb_solder_silk_layer); /* printf("read_pads: front = %d back = %d layer = %d\n", front, back, layer);*/