Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5044) +++ trunk/doc-rnd/hacking/renames (revision 5045) @@ -1010,3 +1010,35 @@ NEWPCB_FLAG_FULLPOLY -> PCB_NEWPCB_FLAG_FULLPOLY HIDENAMESFLAG -> PCB_HIDENAMESFLAG ENABLEPCB_FLAG_MINCUT -> PCB_ENABLEPCB_FLAG_MINCUT +GROUNDPLANEFRAME -> PCB_GROUNDPLANEFRAME +MASKFRAME -> PCB_MASKFRAME +LARGE_VALUE -> PCB_LARGE_VALUE +MAX_LAYER -> PCB_MAX_LAYER +MIN_LINESIZE -> PCB_MIN_LINESIZE +MAX_LINESIZE -> PCB_MAX_LINESIZE +MIN_ARCSIZE -> PCB_MIN_ARCSIZE +MAX_ARCSIZE -> PCB_MAX_ARCSIZE +MIN_TEXTSCALE -> PCB_MIN_TEXTSCALE +MAX_TEXTSCALE -> PCB_MAX_TEXTSCALE +MIN_PINORVIASIZE -> PCB_MIN_PINORVIASIZE +MIN_PINORVIAHOLE -> PCB_MIN_PINORVIAHOLE +MAX_PINORVIASIZE -> PCB_MAX_PINORVIASIZE +MIN_PINORVIACOPPER -> PCB_MIN_PINORVIACOPPER +MIN_PADSIZE -> PCB_MIN_PADSIZE +MAX_PADSIZE -> PCB_MAX_PADSIZE +MIN_DRC_VALUE -> PCB_MIN_DRC_VALUE +MAX_DRC_VALUE -> PCB_MAX_DRC_VALUE +MIN_DRC_SILK -> PCB_MIN_DRC_SILK +MAX_DRC_SILK -> PCB_MAX_DRC_SILK +MIN_DRC_DRILL -> PCB_MIN_DRC_DRILL +MAX_DRC_DRILL -> PCB_MAX_DRC_DRILL +MIN_DRC_RING -> PCB_MIN_DRC_RING +MAX_DRC_RING -> PCB_MAX_DRC_RING +MIN_GRID -> PCB_MIN_GRID +MAX_GRID -> PCB_MAX_GRID +MAX_FONTPOSITION -> PCB_MAX_FONTPOSITION +MAX_COORD -> PCB_MAX_COORD +MIN_SIZE -> PCB_MIN_SIZE +MAX_SIZE -> PCB_MAX_SIZE +MAX_BUFFER -> PCB_MAX_BUFFER +DEFAULT_DRILLINGHOLE -> PCB_DEFAULT_DRILLINGHOLE Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5044) +++ trunk/src/action_helper.c (revision 5045) @@ -301,7 +301,7 @@ Note.Click = pcb_false; if (Note.Moving && !gui->shift_is_pressed()) { Note.Buffer = conf_core.editor.buffer_number; - pcb_buffer_set_number(MAX_BUFFER - 1); + pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(PCB_PASTEBUFFER); pcb_buffer_add_selected(PCB_PASTEBUFFER, Note.X, Note.Y, pcb_true); pcb_undo_save_serial(); @@ -341,10 +341,10 @@ Note.Hit = 0; Note.Moving = pcb_false; pcb_undo_save_serial(); - box.X1 = -MAX_COORD; - box.Y1 = -MAX_COORD; - box.X2 = MAX_COORD; - box.Y2 = MAX_COORD; + box.X1 = -PCB_MAX_COORD; + box.Y1 = -PCB_MAX_COORD; + box.X2 = PCB_MAX_COORD; + box.Y2 = PCB_MAX_COORD; /* unselect first if shift key not down */ if (!gui->shift_is_pressed() && pcb_select_block(&box, pcb_false)) pcb_board_set_changed_flag(pcb_true); @@ -363,10 +363,10 @@ if (Note.Click) { pcb_box_t box; - box.X1 = -MAX_COORD; - box.Y1 = -MAX_COORD; - box.X2 = MAX_COORD; - box.Y2 = MAX_COORD; + box.X1 = -PCB_MAX_COORD; + box.Y1 = -PCB_MAX_COORD; + box.X2 = PCB_MAX_COORD; + box.Y2 = PCB_MAX_COORD; Note.Click = pcb_false; /* inhibit timer action */ pcb_undo_save_serial(); Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 5044) +++ trunk/src/board.c (revision 5045) @@ -51,7 +51,7 @@ pcb_data_free(pcb->Data); free(pcb->Data); /* release font symbols */ - for (i = 0; i <= MAX_FONTPOSITION; i++) + for (i = 0; i <= PCB_MAX_FONTPOSITION; i++) free(pcb->Font.Symbol[i].Line); for (i = 0; i < PCB_NUM_NETLISTS; i++) pcb_lib_free(&(pcb->NetlistLib[i])); @@ -81,7 +81,7 @@ /* this is the most useful starting point for now */ ptr->Grid = conf_core.editor.grid; - ParseGroupString(conf_core.design.groups, &ptr->LayerGroups, MAX_LAYER); + ParseGroupString(conf_core.design.groups, &ptr->LayerGroups, PCB_MAX_LAYER); save = PCB; PCB = ptr; pcb_hid_action("RouteStylesChanged"); @@ -100,7 +100,7 @@ ptr->minDrill = conf_core.design.min_drill; ptr->minRing = conf_core.design.min_ring; - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) ptr->Data->Layer[i].Name = pcb_strdup(conf_core.design.default_layer_name[i]); pcb_font_create_default(ptr); @@ -167,7 +167,7 @@ ptr->ViaSelectedColor = conf_core.appearance.color.via_selected; ptr->WarnColor = conf_core.appearance.color.warn; ptr->MaskColor = conf_core.appearance.color.mask; - for (i = 0; i < MAX_LAYER; i++) { + for (i = 0; i < PCB_MAX_LAYER; i++) { ptr->Data->Layer[i].Color = conf_core.appearance.color.layer[i]; ptr->Data->Layer[i].SelectedColor = conf_core.appearance.color.layer_selected[i]; } @@ -257,7 +257,7 @@ /* sets cursor grid with respect to grid offset values */ void pcb_board_set_grid(pcb_coord_t Grid, pcb_bool align) { - if (Grid >= 1 && Grid <= MAX_GRID) { + if (Grid >= 1 && Grid <= PCB_MAX_GRID) { if (align) { PCB->GridOffsetX = pcb_crosshair.X % Grid; PCB->GridOffsetY = pcb_crosshair.Y % Grid; @@ -272,7 +272,7 @@ /* sets a new line thickness */ void pcb_board_set_line_width(pcb_coord_t Size) { - if (Size >= MIN_LINESIZE && Size <= MAX_LINESIZE) { + if (Size >= PCB_MIN_LINESIZE && Size <= PCB_MAX_LINESIZE) { conf_set_design("design/line_thickness", "%$mS", Size); if (conf_core.editor.auto_drc) pcb_crosshair_grid_fit(pcb_crosshair.X, pcb_crosshair.Y); @@ -282,7 +282,7 @@ /* sets a new via thickness */ void pcb_board_set_via_size(pcb_coord_t Size, pcb_bool Force) { - if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIASIZE && Size >= conf_core.design.via_drilling_hole + MIN_PINORVIACOPPER)) { + if (Force || (Size <= PCB_MAX_PINORVIASIZE && Size >= PCB_MIN_PINORVIASIZE && Size >= conf_core.design.via_drilling_hole + PCB_MIN_PINORVIACOPPER)) { conf_set_design("design/via_thickness", "%$mS", Size); } } @@ -290,7 +290,7 @@ /* sets a new via drilling hole */ void pcb_board_set_via_drilling_hole(pcb_coord_t Size, pcb_bool Force) { - if (Force || (Size <= MAX_PINORVIASIZE && Size >= MIN_PINORVIAHOLE && Size <= conf_core.design.via_thickness - MIN_PINORVIACOPPER)) { + if (Force || (Size <= PCB_MAX_PINORVIASIZE && Size >= PCB_MIN_PINORVIAHOLE && Size <= conf_core.design.via_thickness - PCB_MIN_PINORVIACOPPER)) { conf_set_design("design/via_drilling_hole", "%$mS", Size); } } @@ -298,7 +298,7 @@ /* sets a clearance width */ void pcb_board_set_clearance(pcb_coord_t Width) { - if (Width <= MAX_LINESIZE) { + if (Width <= PCB_MAX_LINESIZE) { conf_set_design("design/clearance", "%$mS", Width); } } @@ -306,7 +306,7 @@ /* sets a text scaling */ void pcb_board_set_text_scale(int Scale) { - if (Scale <= MAX_TEXTSCALE && Scale >= MIN_TEXTSCALE) { + if (Scale <= PCB_MAX_TEXTSCALE && Scale >= PCB_MIN_TEXTSCALE) { conf_set_design("design/text_scale", "%d", Scale); } } Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 5044) +++ trunk/src/buffer.c (revision 5045) @@ -384,7 +384,7 @@ { int i; - for (i = 0; i < MAX_BUFFER; i++) + for (i = 0; i < PCB_MAX_BUFFER; i++) pcb_buffers[i].Data = pcb_buffer_new(); } @@ -392,7 +392,7 @@ { int i; - for (i = 0; i < MAX_BUFFER; i++) { + for (i = 0; i < PCB_MAX_BUFFER; i++) { pcb_buffer_clear(pcb_buffers+i); free(pcb_buffers[i].Data); } @@ -579,7 +579,7 @@ { int i; - for (i = 0; i < MAX_BUFFER; i++) + for (i = 0; i < PCB_MAX_BUFFER; i++) pcb_buffer_swap(&pcb_buffers[i]); pcb_crosshair_range_to_buffer(); } @@ -699,7 +699,7 @@ void pcb_buffer_set_number(int Number) { - if (Number >= 0 && Number < MAX_BUFFER) { + if (Number >= 0 && Number < PCB_MAX_BUFFER) { conf_set_design("editor/buffer_number", "%d", Number); /* do an update on the crosshair range */ @@ -711,7 +711,7 @@ /* ---------------------------------------------------------------------- */ static const char pastebuffer_syntax[] = - "PasteBuffer(AddSelected|Clear|1..MAX_BUFFER)\n" + "PasteBuffer(AddSelected|Clear|1..PCB_MAX_BUFFER)\n" "PasteBuffer(Rotate, 1..3)\n" "PasteBuffer(Convert|Restore|Mirror)\n" "PasteBuffer(ToLayout, X, Y, units)\n" "PasteBuffer(Save, Filename, [format], [force])"; static const char pastebuffer_help[] = "Various operations on the paste buffer."; @@ -719,7 +719,7 @@ /* %start-doc actions PasteBuffer There are a number of paste buffers; the actual limit is a -compile-time constant @code{MAX_BUFFER} in @file{globalconst.h}. It +compile-time constant @code{PCB_MAX_BUFFER} in @file{globalconst.h}. It is currently @code{5}. One of these is the ``current'' paste buffer, often referred to as ``the'' paste buffer. @@ -762,7 +762,7 @@ units, currently 1/100 mil. -@item 1..MAX_BUFFER +@item 1..PCB_MAX_BUFFER Selects the given buffer to be the current paste buffer. @end table Index: trunk/src/conf.c =================================================================== --- trunk/src/conf.c (revision 5044) +++ trunk/src/conf.c (revision 5045) @@ -890,7 +890,7 @@ dln = dln->data.list.first; /* Set up default layer names - make sure there are enough layers (over the hardwired ones, if any) */ - for (i = 0; i < MAX_LAYER; i++) { + for (i = 0; i < PCB_MAX_LAYER; i++) { char buf[20]; if (dln == NULL) { sprintf(buf, "signal%d", i + 1); Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 5044) +++ trunk/src/conf_core.c (revision 5045) @@ -43,11 +43,11 @@ void conf_core_postproc() { - conf_clamp_to(CFT_COORD, conf_core.design.line_thickness, MIN_LINESIZE, MAX_LINESIZE, PCB_MIL_TO_COORD(10)); - conf_clamp_to(CFT_COORD, conf_core.design.via_thickness, MIN_PINORVIASIZE, MAX_PINORVIASIZE, PCB_MIL_TO_COORD(40)); - conf_clamp_to(CFT_COORD, conf_core.design.via_drilling_hole, 0, MAX_COORD, DEFAULT_DRILLINGHOLE * conf_core.design.via_thickness / 100); - conf_clamp(CFT_COORD, conf_core.design.max_width, MIN_SIZE, MAX_COORD); - conf_clamp(CFT_COORD, conf_core.design.max_height, MIN_SIZE, MAX_COORD); + conf_clamp_to(CFT_COORD, conf_core.design.line_thickness, PCB_MIN_LINESIZE, PCB_MAX_LINESIZE, PCB_MIL_TO_COORD(10)); + conf_clamp_to(CFT_COORD, conf_core.design.via_thickness, PCB_MIN_PINORVIASIZE, PCB_MAX_PINORVIASIZE, PCB_MIL_TO_COORD(40)); + conf_clamp_to(CFT_COORD, conf_core.design.via_drilling_hole, 0, PCB_MAX_COORD, PCB_DEFAULT_DRILLINGHOLE * conf_core.design.via_thickness / 100); + conf_clamp(CFT_COORD, conf_core.design.max_width, PCB_MIN_SIZE, PCB_MAX_COORD); + conf_clamp(CFT_COORD, conf_core.design.max_height, PCB_MIN_SIZE, PCB_MAX_COORD); conf_force_set_bool(conf_core.rc.have_regex, 1); conf_ro("rc/have_regex"); Index: trunk/src/conf_core.h =================================================================== --- trunk/src/conf_core.h (revision 5044) +++ trunk/src/conf_core.h (revision 5045) @@ -134,7 +134,7 @@ CFT_COORD min_ring; CFT_INTEGER text_scale; /* text scaling in % */ CFT_REAL poly_isle_area; /* polygon min area */ - CFT_STRING default_layer_name[MAX_LAYER]; + CFT_STRING default_layer_name[PCB_MAX_LAYER]; CFT_STRING fab_author; /* Full name of author for FAB drawings */ CFT_STRING initial_layer_stack; /* If set, the initial layer stack is set to this */ @@ -177,8 +177,8 @@ CFT_COLOR connected; CFT_COLOR off_limit; CFT_COLOR grid; - CFT_COLOR layer[MAX_LAYER]; - CFT_COLOR layer_selected[MAX_LAYER]; + CFT_COLOR layer[PCB_MAX_LAYER]; + CFT_COLOR layer_selected[PCB_MAX_LAYER]; CFT_COLOR warn; CFT_COLOR mask; } color; Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 5044) +++ trunk/src/data.c (revision 5045) @@ -37,9 +37,9 @@ /* --------------------------------------------------------------------------- * some shared identifiers */ -int pcb_layer_stack[MAX_LAYER]; /* determines the layer draw order */ +int pcb_layer_stack[PCB_MAX_LAYER]; /* determines the layer draw order */ -pcb_buffer_t pcb_buffers[MAX_BUFFER]; /* my buffers */ +pcb_buffer_t pcb_buffers[PCB_MAX_BUFFER]; /* my buffers */ pcb_bool pcb_bumped; /* if the undo serial number has changed */ int pcb_added_lines; @@ -196,7 +196,7 @@ list_map0(&data->Element, pcb_element_t, pcb_element_free); list_map0(&data->Rat, pcb_rat_t, pcb_rat_free); - for (layer = data->Layer, i = 0; i < MAX_LAYER + 2; layer++, i++) { + for (layer = data->Layer, i = 0; i < PCB_MAX_LAYER + 2; layer++, i++) { pcb_attribute_free(&layer->Attributes); PCB_TEXT_LOOP(layer); { @@ -273,8 +273,8 @@ /* FIX ME: use r_search to do this much faster */ /* preset identifiers with highest and lowest possible values */ - box.X1 = box.Y1 = MAX_COORD; - box.X2 = box.Y2 = -MAX_COORD; + box.X1 = box.Y1 = PCB_MAX_COORD; + box.X2 = box.Y2 = -PCB_MAX_COORD; /* now scan for the lowest/highest X and Y coordinate */ PCB_VIA_LOOP(Data); Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 5044) +++ trunk/src/data.h (revision 5045) @@ -47,7 +47,7 @@ pcb_rtree_t *via_tree, *element_tree, *pin_tree, *pad_tree, *name_tree[3], /* for element names */ *rat_tree; pcb_board_t *pcb; - pcb_layer_t Layer[MAX_LAYER + 2]; /* add 2 silkscreen layers */ + pcb_layer_t Layer[PCB_MAX_LAYER + 2]; /* add 2 silkscreen layers */ pcb_plug_io_t *loader; ratlist_t Rat; }; @@ -58,9 +58,9 @@ #define pcb_solder_silk_layer (pcb_max_copper_layer + SOLDER_LAYER) #define pcb_component_silk_layer (pcb_max_copper_layer + COMPONENT_LAYER) -extern pcb_buffer_t pcb_buffers[MAX_BUFFER]; +extern pcb_buffer_t pcb_buffers[PCB_MAX_BUFFER]; extern int pcb_added_lines; -extern int pcb_layer_stack[MAX_LAYER]; +extern int pcb_layer_stack[PCB_MAX_LAYER]; extern pcb_bool pcb_bumped; Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 5044) +++ trunk/src/draw.c (revision 5045) @@ -180,9 +180,9 @@ int i, ngroups, side; int component, solder; /* This is the list of layer groups we will draw. */ - int do_group[MAX_LAYER]; + int do_group[PCB_MAX_LAYER]; /* This is the reverse of the order in which we draw them. */ - int drawn_groups[MAX_LAYER]; + int drawn_groups[PCB_MAX_LAYER]; pcb_bool paste_empty; Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 5044) +++ trunk/src/find.c (revision 5045) @@ -144,8 +144,8 @@ static pcb_bool IsBad = pcb_false; static pcb_cardinal_t drcerr_count; /* count of drc errors */ static pcb_cardinal_t TotalP, TotalV, NumberOfPads[2]; -static ListType LineList[MAX_LAYER], /* list of objects to */ - PolygonList[MAX_LAYER], ArcList[MAX_LAYER], PadList[2], RatList, PVList; +static ListType LineList[PCB_MAX_LAYER], /* list of objects to */ + PolygonList[PCB_MAX_LAYER], ArcList[PCB_MAX_LAYER], PadList[2], RatList, PVList; /* --------------------------------------------------------------------------- * some local prototypes Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 5044) +++ trunk/src/find_lookup.c (revision 5045) @@ -436,7 +436,7 @@ { pcb_bool done; pcb_cardinal_t i, group, layer, ratposition, - lineposition[MAX_LAYER], polyposition[MAX_LAYER], arcposition[MAX_LAYER], padposition[2]; + lineposition[PCB_MAX_LAYER], polyposition[PCB_MAX_LAYER], arcposition[PCB_MAX_LAYER], padposition[2]; /* copy the current LO list positions; the original data is changed * by 'LookupPVConnectionsToLOList()' which has to check the same Index: trunk/src/flag.h =================================================================== --- trunk/src/flag.h (revision 5044) +++ trunk/src/flag.h (revision 5045) @@ -40,7 +40,7 @@ typedef struct { unsigned long f; /* generic flags */ - unsigned char t[(MAX_LAYER + 1) / 2]; /* thermals */ + unsigned char t[(PCB_MAX_LAYER + 1) / 2]; /* thermals */ unsigned char q; /* square geometry flag */ unsigned char int_conn_grp; pcb_unknown_flag_t *unknowns; Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 5044) +++ trunk/src/flag_str.c (revision 5045) @@ -347,7 +347,7 @@ ep = parse_layer_list(ep + 1, error); if (flen == 7 && memcmp(fp, "thermal", 7) == 0) { - for (i = 0; i < MAX_LAYER && i < num_layers; i++) + for (i = 0; i < PCB_MAX_LAYER && i < num_layers; i++) if (layers[i]) PCB_FLAG_THERM_ASSIGN(i, layers[i], &rv); } @@ -459,7 +459,7 @@ if (PCB_FLAG_THERM_TEST_ANY(&fh)) { len += sizeof("thermal()"); - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) if (PCB_FLAG_THERM_TEST(i, &fh)) len += printed_int_length(i, PCB_FLAG_THERM_GET(i, &fh)) + 1; } @@ -501,7 +501,7 @@ strcpy(bp, "thermal"); bp += strlen("thermal"); grow_layer_list(0); - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) if (PCB_FLAG_THERM_TEST(i, &fh)) set_layer_list(i, PCB_FLAG_THERM_GET(i, &fh)); strcpy(bp, print_layer_list()); Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 5044) +++ trunk/src/font.c (revision 5045) @@ -66,7 +66,7 @@ pcb_cardinal_t i, j; pcb_symbol_t *symbol; pcb_line_t *line; - pcb_coord_t totalminy = MAX_COORD; + pcb_coord_t totalminy = PCB_MAX_COORD; /* calculate cell with and height (is at least DEFAULT_CELLSIZE) * maximum cell width and height @@ -74,7 +74,7 @@ */ Ptr->MaxWidth = DEFAULT_CELLSIZE; Ptr->MaxHeight = DEFAULT_CELLSIZE; - for (i = 0, symbol = Ptr->Symbol; i <= MAX_FONTPOSITION; i++, symbol++) { + for (i = 0, symbol = Ptr->Symbol; i <= PCB_MAX_FONTPOSITION; i++, symbol++) { pcb_coord_t minx, miny, maxx, maxy; /* next one if the index isn't used or symbol is empty (SPACE) */ @@ -81,7 +81,7 @@ if (!symbol->Valid || !symbol->LineN) continue; - minx = miny = MAX_COORD; + minx = miny = PCB_MAX_COORD; maxx = maxy = 0; for (line = symbol->Line, j = symbol->LineN; j; j--, line++) { minx = MIN(minx, line->Point1.X); @@ -109,7 +109,7 @@ } /* move coordinate system to the upper edge (lowest y on screen) */ - for (i = 0, symbol = Ptr->Symbol; i <= MAX_FONTPOSITION; i++, symbol++) + for (i = 0, symbol = Ptr->Symbol; i <= PCB_MAX_FONTPOSITION; i++, symbol++) if (symbol->Valid) { symbol->Height -= totalminy; for (line = symbol->Line, j = symbol->LineN; j; j--, line++) Index: trunk/src/font.h =================================================================== --- trunk/src/font.h (revision 5044) +++ trunk/src/font.h (revision 5045) @@ -44,7 +44,7 @@ struct pcb_font_s { /* complete set of symbols */ pcb_coord_t MaxHeight, MaxWidth; /* maximum cell width and height */ pcb_box_t DefaultSymbol; /* the default symbol is a filled box */ - pcb_symbol_t Symbol[MAX_FONTPOSITION + 1]; + pcb_symbol_t Symbol[PCB_MAX_FONTPOSITION + 1]; pcb_bool Valid; }; Index: trunk/src/globalconst.h =================================================================== --- trunk/src/globalconst.h (revision 5044) +++ trunk/src/globalconst.h (revision 5045) @@ -38,49 +38,49 @@ /* frame between the groundplane and the copper or mask - noone seems to remember what these two are for; changing them may have unforeseen side effects. */ -#define GROUNDPLANEFRAME PCB_MIL_TO_COORD(15) -#define MASKFRAME PCB_MIL_TO_COORD(3) +#define PCB_GROUNDPLANEFRAME PCB_MIL_TO_COORD(15) +#define PCB_MASKFRAME PCB_MIL_TO_COORD(3) /* --------------------------------------------------------------------------- * some limit specifications */ -#define LARGE_VALUE (COORD_MAX / 2 - 1) /* maximum extent of board and elements */ +#define PCB_LARGE_VALUE (COORD_MAX / 2 - 1) /* maximum extent of board and elements */ -#define MAX_LAYER 16 /* max number of layer, check source code for more changes, a *lot* more changes */ -#define MIN_LINESIZE PCB_MIL_TO_COORD(0.01) /* thickness of lines */ -#define MAX_LINESIZE LARGE_VALUE -#define MIN_ARCSIZE PCB_MIL_TO_COORD(0.01) -#define MAX_ARCSIZE LARGE_VALUE -#define MIN_TEXTSCALE 10 /* scaling of text objects in percent */ -#define MAX_TEXTSCALE 10000 -#define MIN_PINORVIASIZE PCB_MIL_TO_COORD(20) /* size of a pin or via */ -#define MIN_PINORVIAHOLE PCB_MIL_TO_COORD(4) /* size of a pins or vias drilling hole */ -#define MAX_PINORVIASIZE LARGE_VALUE -#define MIN_PINORVIACOPPER PCB_MIL_TO_COORD(4) /* min difference outer-inner diameter */ -#define MIN_PADSIZE PCB_MIL_TO_COORD(1) /* min size of a pad */ -#define MAX_PADSIZE LARGE_VALUE /* max size of a pad */ -#define MIN_DRC_VALUE PCB_MIL_TO_COORD(0.1) -#define MAX_DRC_VALUE PCB_MIL_TO_COORD(500) -#define MIN_DRC_SILK PCB_MIL_TO_COORD(1) -#define MAX_DRC_SILK PCB_MIL_TO_COORD(30) -#define MIN_DRC_DRILL PCB_MIL_TO_COORD(1) -#define MAX_DRC_DRILL PCB_MIL_TO_COORD(50) -#define MIN_DRC_RING 0 -#define MAX_DRC_RING PCB_MIL_TO_COORD(100) -#define MIN_GRID 1 -#define MAX_GRID PCB_MIL_TO_COORD(1000) -#define MAX_FONTPOSITION 255 /* upper limit of characters in my font */ +#define PCB_MAX_LAYER 16 /* max number of layer, check source code for more changes, a *lot* more changes */ +#define PCB_MIN_LINESIZE PCB_MIL_TO_COORD(0.01) /* thickness of lines */ +#define PCB_MAX_LINESIZE PCB_LARGE_VALUE +#define PCB_MIN_ARCSIZE PCB_MIL_TO_COORD(0.01) +#define PCB_MAX_ARCSIZE PCB_LARGE_VALUE +#define PCB_MIN_TEXTSCALE 10 /* scaling of text objects in percent */ +#define PCB_MAX_TEXTSCALE 10000 +#define PCB_MIN_PINORVIASIZE PCB_MIL_TO_COORD(20) /* size of a pin or via */ +#define PCB_MIN_PINORVIAHOLE PCB_MIL_TO_COORD(4) /* size of a pins or vias drilling hole */ +#define PCB_MAX_PINORVIASIZE PCB_LARGE_VALUE +#define PCB_MIN_PINORVIACOPPER PCB_MIL_TO_COORD(4) /* min difference outer-inner diameter */ +#define PCB_MIN_PADSIZE PCB_MIL_TO_COORD(1) /* min size of a pad */ +#define PCB_MAX_PADSIZE PCB_LARGE_VALUE /* max size of a pad */ +#define PCB_MIN_DRC_VALUE PCB_MIL_TO_COORD(0.1) +#define PCB_MAX_DRC_VALUE PCB_MIL_TO_COORD(500) +#define PCB_MIN_DRC_SILK PCB_MIL_TO_COORD(1) +#define PCB_MAX_DRC_SILK PCB_MIL_TO_COORD(30) +#define PCB_MIN_DRC_DRILL PCB_MIL_TO_COORD(1) +#define PCB_MAX_DRC_DRILL PCB_MIL_TO_COORD(50) +#define PCB_MIN_DRC_RING 0 +#define PCB_MAX_DRC_RING PCB_MIL_TO_COORD(100) +#define PCB_MIN_GRID 1 +#define PCB_MAX_GRID PCB_MIL_TO_COORD(1000) +#define PCB_MAX_FONTPOSITION 255 /* upper limit of characters in my font */ -#define MAX_COORD LARGE_VALUE /* coordinate limits */ -#define MIN_SIZE PCB_MIL_TO_COORD(10) /* lowest width and height of the board */ -#define MAX_BUFFER 5 /* number of pastebuffers additional changes in menu.c are also required to select more buffers */ +#define PCB_MAX_COORD PCB_LARGE_VALUE /* coordinate limits */ +#define PCB_MIN_SIZE PCB_MIL_TO_COORD(10) /* lowest width and height of the board */ +#define PCB_MAX_BUFFER 5 /* number of pastebuffers additional changes in menu.c are also required to select more buffers */ -#define DEFAULT_DRILLINGHOLE 40 /* default inner/outer ratio for pins/vias in percent */ +#define PCB_DEFAULT_DRILLINGHOLE 40 /* default inner/outer ratio for pins/vias in percent */ -#if MAX_LINESIZE > MAX_PINORVIASIZE /* maximum size value */ -#define MAX_SIZE MAX_LINESIZE +#if PCB_MAX_LINESIZE > PCB_MAX_PINORVIASIZE /* maximum size value */ +#define PCB_MAX_SIZE PCB_MAX_LINESIZE #else -#define MAX_SIZE MAX_PINORVIASIZE +#define PCB_MAX_SIZE PCB_MAX_PINORVIASIZE #endif #ifndef MAXPATHLEN /* maximum path length */ Index: trunk/src/hid_flags.h =================================================================== --- trunk/src/hid_flags.h (revision 5044) +++ trunk/src/hid_flags.h (revision 5045) @@ -3,7 +3,7 @@ /* Use this to temporarily enable all layers, so that they can be exported even if they're not currently visible. save_array must be - MAX_LAYER+2 big. */ + PCB_MAX_LAYER+2 big. */ void pcb_hid_save_and_show_layer_ons(int *save_array); /* Use this to restore them. */ void pcb_hid_restore_layer_ons(int *save_array); Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 5044) +++ trunk/src/layer.c (revision 5045) @@ -41,8 +41,8 @@ static struct { pcb_bool ElementOn, InvisibleObjectsOn, PinOn, ViaOn, RatOn; - int pcb_layer_stack[MAX_LAYER]; - pcb_bool LayerOn[MAX_LAYER]; + int pcb_layer_stack[PCB_MAX_LAYER]; + pcb_bool LayerOn[PCB_MAX_LAYER]; int cnt; } SavedStack; @@ -75,13 +75,13 @@ int group, member, layer; pcb_bool c_set = pcb_false, /* flags for the two special layers to */ s_set = pcb_false; /* provide a default setting for old formats */ - int groupnum[MAX_LAYER + 2]; + int groupnum[PCB_MAX_LAYER + 2]; /* clear struct */ memset(LayerGroup, 0, sizeof(pcb_layer_group_t)); /* Clear assignments */ - for (layer = 0; layer < MAX_LAYER + 2; layer++) + for (layer = 0; layer < PCB_MAX_LAYER + 2; layer++) groupnum[layer] = -1; /* loop over all groups */ @@ -163,7 +163,7 @@ { int i; - for (i = 0; i < MAX_LAYER + 2; i++) + for (i = 0; i < PCB_MAX_LAYER + 2; i++) if (Layer == &Data->Layer[i]) break; return (i); @@ -377,7 +377,7 @@ int comp_group; pcb_cardinal_t i; - assert(PCB->Data->LayerN <= MAX_LAYER); + assert(PCB->Data->LayerN <= PCB_MAX_LAYER); for (i = 0; i < pcb_max_copper_layer + 2; i++) { if (i < pcb_max_copper_layer) pcb_layer_stack[i] = i; @@ -499,9 +499,9 @@ char *LayerGroupsToString(pcb_layer_group_t *lg) { -#if MAX_LAYER < 9998 +#if PCB_MAX_LAYER < 9998 /* Allows for layer numbers 0..9999 */ - static char buf[(MAX_LAYER + 2) * 5 + 1]; + static char buf[(PCB_MAX_LAYER + 2) * 5 + 1]; #endif char *cp = buf; char sep = 0; @@ -593,7 +593,7 @@ { int n, used = 0; - for (n = 0; n < MAX_LAYER + 2; n++) { + for (n = 0; n < PCB_MAX_LAYER + 2; n++) { if ((pcb_layer_flags(n) & mask) == mask) APPEND(n); } @@ -651,7 +651,7 @@ int n; /* reset layer names */ - for(n = 2; n < MAX_LAYER; n++) { + for(n = 2; n < PCB_MAX_LAYER; n++) { if (PCB->Data->Layer[n].Name != NULL) free((char *)PCB->Data->Layer[n].Name); PCB->Data->Layer[n].Name = pcb_strdup(""); @@ -658,7 +658,7 @@ } /* reset layer groups */ - for(n = 0; n < MAX_LAYER; n++) + for(n = 0; n < PCB_MAX_LAYER; n++) PCB->LayerGroups.Number[n] = 0; /* set up one copper layer on top and one on bottom */ @@ -697,7 +697,7 @@ case PCB_LYT_TOP: return COMPONENT_LAYER; case PCB_LYT_BOTTOM: return SOLDER_LAYER; case PCB_LYT_INTERN: - for(grp = 2; grp < MAX_LAYER; grp++) { + for(grp = 2; grp < PCB_MAX_LAYER; grp++) { if (PCB->LayerGroups.Number[grp] > 0) { id = PCB->LayerGroups.Entries[grp][0]; if (strcmp(PCB->Data->Layer[id].Name, "outline") != 0) @@ -709,7 +709,7 @@ break; case PCB_LYT_OUTLINE: - for(grp = 2; grp < MAX_LAYER; grp++) { + for(grp = 2; grp < PCB_MAX_LAYER; grp++) { if (PCB->LayerGroups.Number[grp] > 0) { id = PCB->LayerGroups.Entries[grp][0]; if (strcmp(PCB->Data->Layer[id].Name, "outline") == 0) @@ -756,7 +756,7 @@ abort(); /* can't get here */ case PCB_LYT_INTERN: /* find the first internal layer */ - for(found = 0, grp = 2; grp < MAX_LAYER; grp++) { + for(found = 0, grp = 2; grp < PCB_MAX_LAYER; grp++) { if (PCB->LayerGroups.Number[grp] > 0) { id = PCB->LayerGroups.Entries[grp][0]; if (strcmp(PCB->Data->Layer[id].Name, "outline") != 0) { @@ -777,10 +777,10 @@ if (grp < 0) { /* Also need to create a group */ - for(grp = 0; grp < MAX_LAYER; grp++) + for(grp = 0; grp < PCB_MAX_LAYER; grp++) if (PCB->LayerGroups.Number[grp] == 0) break; - if (grp >= MAX_LAYER) + if (grp >= PCB_MAX_LAYER) return -2; } @@ -861,9 +861,9 @@ t1 = PCB_FLAG_THERM_GET(old_index, pin); if (oi == -1) - oi = MAX_LAYER - 1; /* inserting a layer */ + oi = PCB_MAX_LAYER - 1; /* inserting a layer */ if (ni == -1) - ni = MAX_LAYER - 1; /* deleting a layer */ + ni = PCB_MAX_LAYER - 1; /* deleting a layer */ if (oi < ni) { for (i = oi; i < ni; i++) @@ -924,7 +924,7 @@ int pcb_layer_move(int old_index, int new_index) { - int groups[MAX_LAYER + 2], l, g; + int groups[PCB_MAX_LAYER + 2], l, g; pcb_layer_t saved_layer; int saved_group; @@ -935,7 +935,7 @@ pcb_message(PCB_MSG_DEFAULT, "Invalid old layer %d for move: must be -1..%d\n", old_index, pcb_max_copper_layer - 1); return 1; } - if (new_index < -1 || new_index > pcb_max_copper_layer || new_index >= MAX_LAYER) { + if (new_index < -1 || new_index > pcb_max_copper_layer || new_index >= PCB_MAX_LAYER) { pcb_message(PCB_MSG_DEFAULT, "Invalid new layer %d for move: must be -1..%d\n", new_index, pcb_max_copper_layer); return 1; } @@ -952,16 +952,16 @@ return 1; } - for (g = 0; g < MAX_LAYER + 2; g++) + for (g = 0; g < PCB_MAX_LAYER + 2; g++) groups[g] = -1; - for (g = 0; g < MAX_LAYER; g++) + for (g = 0; g < PCB_MAX_LAYER; g++) for (l = 0; l < PCB->LayerGroups.Number[g]; l++) groups[PCB->LayerGroups.Entries[g][l]] = g; if (old_index == -1) { pcb_layer_t *lp; - if (pcb_max_copper_layer == MAX_LAYER) { + if (pcb_max_copper_layer == PCB_MAX_LAYER) { pcb_message(PCB_MSG_DEFAULT, "No room for new layers\n"); return 1; } @@ -1013,7 +1013,7 @@ move_all_thermals(old_index, new_index); - for (g = 0; g < MAX_LAYER; g++) + for (g = 0; g < PCB_MAX_LAYER; g++) PCB->LayerGroups.Number[g] = 0; for (l = 0; l < pcb_max_copper_layer + 2; l++) { int i; @@ -1024,12 +1024,12 @@ } } - for (g = 0; g < MAX_LAYER; g++) + for (g = 0; g < PCB_MAX_LAYER; g++) if (PCB->LayerGroups.Number[g] == 0) { memmove(&PCB->LayerGroups.Number[g], - &PCB->LayerGroups.Number[g + 1], (MAX_LAYER - g - 1) * sizeof(PCB->LayerGroups.Number[g])); + &PCB->LayerGroups.Number[g + 1], (PCB_MAX_LAYER - g - 1) * sizeof(PCB->LayerGroups.Number[g])); memmove(&PCB->LayerGroups.Entries[g], - &PCB->LayerGroups.Entries[g + 1], (MAX_LAYER - g - 1) * sizeof(PCB->LayerGroups.Entries[g])); + &PCB->LayerGroups.Entries[g + 1], (PCB_MAX_LAYER - g - 1) * sizeof(PCB->LayerGroups.Entries[g])); } pcb_hid_action("LayersChanged"); Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 5044) +++ trunk/src/layer.h (revision 5045) @@ -38,8 +38,8 @@ * on/off together. */ struct pcb_layer_group_s { - pcb_cardinal_t Number[MAX_LAYER], /* number of entries per groups */ - Entries[MAX_LAYER][MAX_LAYER + 2]; + pcb_cardinal_t Number[PCB_MAX_LAYER], /* number of entries per groups */ + Entries[PCB_MAX_LAYER][PCB_MAX_LAYER + 2]; }; struct pcb_layer_s { /* holds information about one layer */ @@ -152,7 +152,7 @@ /* --------------------------------------------------------------------------- * the layer-numbers of the two additional special layers - * 'component' and 'solder'. The offset of MAX_LAYER is not added + * 'component' and 'solder'. The offset of PCB_MAX_LAYER is not added */ #define SOLDER_LAYER 0 #define COMPONENT_LAYER 1 @@ -225,7 +225,7 @@ /* changes the name of a layer; memory has to be already allocated */ pcb_bool pcb_layer_change_name(pcb_layer_t *Layer, char *Name); -/* index is 0..MAX_LAYER-1. If old_index is -1, a new layer is +/* index is 0..PCB_MAX_LAYER-1. If old_index is -1, a new layer is inserted at that index. If new_index is -1, the specified layer is deleted. Returns non-zero on error, zero if OK. */ int pcb_layer_move(int old_index, int new_index); Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 5044) +++ trunk/src/obj_arc.c (revision 5045) @@ -257,7 +257,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) return (NULL); - if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != Arc->Thickness) { + if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Arc->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_ARC, Layer, Arc, Arc); EraseArc(Arc); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); @@ -279,7 +279,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) return (NULL); - value = MIN(MAX_LINESIZE, MAX(value, PCB->Bloat * 2 + 2)); + value = MIN(PCB_MAX_LINESIZE, MAX(value, PCB->Bloat * 2 + 2)); if (value != Arc->Clearance) { pcb_undo_add_obj_to_clear_size(PCB_TYPE_ARC, Layer, Arc, Arc); EraseArc(Arc); @@ -320,7 +320,7 @@ } value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : (*dst) + ctx->chgsize.delta; - value = MIN(MAX_ARCSIZE, MAX(value, MIN_ARCSIZE)); + value = MIN(PCB_MAX_ARCSIZE, MAX(value, PCB_MIN_ARCSIZE)); if (value != *dst) { pcb_undo_add_obj_to_change_radii(PCB_TYPE_ARC, Layer, Arc, Arc); EraseArc(Arc); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 5044) +++ trunk/src/obj_elem.c (revision 5045) @@ -274,7 +274,7 @@ { char num[8]; if (via->Mask < via->Thickness) - via->Mask = via->Thickness + 2 * MASKFRAME; + via->Mask = via->Thickness + 2 * PCB_MASKFRAME; if (via->Name) pcb_element_pin_new(Element, via->X, via->Y, via->Thickness, via->Clearance, via->Mask, via->DrillingHole, @@ -575,7 +575,7 @@ Element = pcb_element_alloc(Data); /* copy values and set additional information */ - TextScale = MAX(MIN_TEXTSCALE, TextScale); + TextScale = MAX(PCB_MIN_TEXTSCALE, TextScale); pcb_element_text_set(&DESCRIPTION_TEXT(Element), PCBFont, TextX, TextY, Direction, Description, TextScale, TextFlags); if (uniqueName) NameOnPCB = pcb_element_uniq_name(Data, NameOnPCB); @@ -740,7 +740,7 @@ */ box = &Element->BoundingBox; vbox = &Element->VBox; - box->X1 = box->Y1 = MAX_COORD; + box->X1 = box->Y1 = PCB_MAX_COORD; box->X2 = box->Y2 = 0; PCB_ELEMENT_PCB_LINE_LOOP(Element); { @@ -1191,8 +1191,8 @@ PCB_PIN_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : pin->DrillingHole + ctx->chgsize.delta; - if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) + if (value <= PCB_MAX_PINORVIASIZE && + value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - PCB_MIN_PINORVIACOPPER) && value != pin->DrillingHole) { changed = pcb_true; pcb_undo_add_obj_to_2nd_size(PCB_TYPE_PIN, Element, pin, pin); @@ -1225,7 +1225,7 @@ PCB_PIN_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : pin->DrillingHole + ctx->chgsize.delta; - if (value <= MAX_PINORVIASIZE && value >= pin->DrillingHole + MIN_PINORVIACOPPER && value != pin->Thickness) { + if (value <= PCB_MAX_PINORVIASIZE && value >= pin->DrillingHole + PCB_MIN_PINORVIACOPPER && value != pin->Thickness) { changed = pcb_true; pcb_undo_add_obj_to_size(PCB_TYPE_PIN, Element, pin, pin); ErasePin(pin); @@ -1257,8 +1257,8 @@ PCB_PIN_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : pin->Clearance + ctx->chgsize.delta; - if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - MIN_PINORVIACOPPER) + if (value <= PCB_MAX_PINORVIASIZE && + value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) || value <= pin->Thickness - PCB_MIN_PINORVIACOPPER) && value != pin->Clearance) { changed = pcb_true; pcb_undo_add_obj_to_clear_size(PCB_TYPE_PIN, Element, pin, pin); @@ -1278,7 +1278,7 @@ PCB_PAD_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : pad->Clearance + ctx->chgsize.delta; - if (value <= MAX_PINORVIASIZE && value >= MIN_PINORVIAHOLE && value != pad->Clearance) { + if (value <= PCB_MAX_PINORVIASIZE && value >= PCB_MIN_PINORVIAHOLE && value != pad->Clearance) { changed = pcb_true; pcb_undo_add_obj_to_clear_size(PCB_TYPE_PAD, Element, pad, pad); ErasePad(pad); @@ -1317,7 +1317,7 @@ PCB_ELEMENT_PCB_LINE_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : line->Thickness + ctx->chgsize.delta; - if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != line->Thickness) { + if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != line->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_ELEMENT_LINE, Element, line, line); line->Thickness = value; changed = pcb_true; @@ -1327,7 +1327,7 @@ PCB_ARC_LOOP(Element); { value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : arc->Thickness + ctx->chgsize.delta; - if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != arc->Thickness) { + if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != arc->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_ELEMENT_ARC, Element, arc, arc); arc->Thickness = value; changed = pcb_true; @@ -1350,7 +1350,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, &Element->Name[0])) return (NULL); - if (value <= MAX_TEXTSCALE && value >= MIN_TEXTSCALE) { + if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE) { EraseElementName(Element); PCB_ELEMENT_PCB_TEXT_LOOP(Element); { Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 5044) +++ trunk/src/obj_line.c (revision 5045) @@ -284,7 +284,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) return (NULL); - if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != Line->Thickness) { + if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Line->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_LINE, Layer, Line, Line); EraseLine(Line); pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); @@ -306,7 +306,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) return (NULL); - value = MIN(MAX_LINESIZE, MAX(value, PCB->Bloat * 2 + 2)); + value = MIN(PCB_MAX_LINESIZE, MAX(value, PCB->Bloat * 2 + 2)); if (value != Line->Clearance) { pcb_undo_add_obj_to_clear_size(PCB_TYPE_LINE, Layer, Line, Line); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_LINE, Layer, Line); Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 5044) +++ trunk/src/obj_pad.c (revision 5045) @@ -161,7 +161,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (NULL); - if (value <= MAX_PADSIZE && value >= MIN_PADSIZE && value != Pad->Thickness) { + if (value <= PCB_MAX_PADSIZE && value >= PCB_MIN_PADSIZE && value != Pad->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_PAD, Element, Pad, Pad); pcb_undo_add_obj_to_mask_size(PCB_TYPE_PAD, Element, Pad, Pad); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PAD, Element, Pad); @@ -185,7 +185,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad)) return (NULL); - value = MIN(MAX_LINESIZE, value); + value = MIN(PCB_MAX_LINESIZE, value); if (value < 0) value = 0; if (ctx->chgsize.delta < 0 && value < PCB->Bloat * 2) Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 5044) +++ trunk/src/obj_pinvia.c (revision 5045) @@ -124,11 +124,11 @@ Via->ID = CreateIDGet(); /* - * don't complain about MIN_PINORVIACOPPER on a mounting hole (pure + * don't complain about PCB_MIN_PINORVIACOPPER on a mounting hole (pure * hole) */ - if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && (Via->Thickness < Via->DrillingHole + MIN_PINORVIACOPPER)) { - Via->Thickness = Via->DrillingHole + MIN_PINORVIACOPPER; + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && (Via->Thickness < Via->DrillingHole + PCB_MIN_PINORVIACOPPER)) { + Via->Thickness = Via->DrillingHole + PCB_MIN_PINORVIACOPPER; pcb_message(PCB_MSG_DEFAULT, _("%m+Increased via thickness to %$mS to allow enough copper" " at %$mD.\n"), conf_core.editor.grid_unit->allow, Via->Thickness, Via->X, Via->Y); } @@ -164,18 +164,18 @@ /* Unless we should not map drills on this element, map them! */ if (pcb_stub_vendor_is_element_mappable(Element)) { - if (pin->DrillingHole < MIN_PINORVIASIZE) { + if (pin->DrillingHole < PCB_MIN_PINORVIASIZE) { pcb_message(PCB_MSG_DEFAULT, _("%m+Did not map pin #%s (%s) drill hole because %$mS is below the minimum allowed size\n"), conf_core.editor.grid_unit->allow, PCB_UNKNOWN(Number), PCB_UNKNOWN(Name), pin->DrillingHole); pin->DrillingHole = DrillingHole; } - else if (pin->DrillingHole > MAX_PINORVIASIZE) { + else if (pin->DrillingHole > PCB_MAX_PINORVIASIZE) { pcb_message(PCB_MSG_DEFAULT, _("%m+Did not map pin #%s (%s) drill hole because %$mS is above the maximum allowed size\n"), conf_core.editor.grid_unit->allow, PCB_UNKNOWN(Number), PCB_UNKNOWN(Name), pin->DrillingHole); pin->DrillingHole = DrillingHole; } else if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, pin) - && (pin->DrillingHole > pin->Thickness - MIN_PINORVIACOPPER)) { + && (pin->DrillingHole > pin->Thickness - PCB_MIN_PINORVIACOPPER)) { pcb_message(PCB_MSG_DEFAULT, _("%m+Did not map pin #%s (%s) drill hole because %$mS does not leave enough copper\n"), conf_core.editor.grid_unit->allow, PCB_UNKNOWN(Number), PCB_UNKNOWN(Name), pin->DrillingHole); pin->DrillingHole = DrillingHole; @@ -295,8 +295,8 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); - if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIASIZE && value >= Via->DrillingHole + MIN_PINORVIACOPPER && value != Via->Thickness) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && value <= PCB_MAX_PINORVIASIZE && + value >= PCB_MIN_PINORVIASIZE && value >= Via->DrillingHole + PCB_MIN_PINORVIACOPPER && value != Via->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_VIA, Via, Via, Via); EraseVia(Via); pcb_r_delete_entry(PCB->Data->via_tree, (pcb_box_t *) Via); @@ -322,8 +322,8 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); - if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) || value <= Via->Thickness - MIN_PINORVIACOPPER) + if (value <= PCB_MAX_PINORVIASIZE && + value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) || value <= Via->Thickness - PCB_MIN_PINORVIACOPPER) && value != Via->DrillingHole) { pcb_undo_add_obj_to_2nd_size(PCB_TYPE_VIA, Via, Via, Via); EraseVia(Via); @@ -347,8 +347,8 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); - if (value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) || value <= Pin->Thickness - MIN_PINORVIACOPPER) + if (value <= PCB_MAX_PINORVIASIZE && + value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) || value <= Pin->Thickness - PCB_MIN_PINORVIACOPPER) && value != Pin->DrillingHole) { pcb_undo_add_obj_to_2nd_size(PCB_TYPE_PIN, Element, Pin, Pin); ErasePin(Pin); @@ -373,7 +373,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via)) return (NULL); - value = MIN(MAX_LINESIZE, value); + value = MIN(PCB_MAX_LINESIZE, value); if (value < 0) value = 0; if (ctx->chgsize.delta < 0 && value < PCB->Bloat * 2) @@ -403,8 +403,8 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); - if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && value <= MAX_PINORVIASIZE && - value >= MIN_PINORVIASIZE && value >= Pin->DrillingHole + MIN_PINORVIACOPPER && value != Pin->Thickness) { + if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && value <= PCB_MAX_PINORVIASIZE && + value >= PCB_MIN_PINORVIASIZE && value >= Pin->DrillingHole + PCB_MIN_PINORVIACOPPER && value != Pin->Thickness) { pcb_undo_add_obj_to_size(PCB_TYPE_PIN, Element, Pin, Pin); pcb_undo_add_obj_to_mask_size(PCB_TYPE_PIN, Element, Pin, Pin); ErasePin(Pin); @@ -428,7 +428,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin)) return (NULL); - value = MIN(MAX_LINESIZE, value); + value = MIN(PCB_MAX_LINESIZE, value); if (value < 0) value = 0; if (ctx->chgsize.delta < 0 && value < PCB->Bloat * 2) @@ -644,7 +644,7 @@ Via->Mask = (Via->DrillingHole + (Via->Mask - Via->Thickness)); } else if (Via->Mask < Via->DrillingHole) { - Via->Mask = Via->DrillingHole + 2 * MASKFRAME; + Via->Mask = Via->DrillingHole + 2 * PCB_MASKFRAME; } } else { Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 5044) +++ trunk/src/obj_poly.c (revision 5045) @@ -132,7 +132,7 @@ /* sets the bounding box of a polygons */ void pcb_poly_bbox(pcb_polygon_t *Polygon) { - Polygon->BoundingBox.X1 = Polygon->BoundingBox.Y1 = MAX_COORD; + Polygon->BoundingBox.X1 = Polygon->BoundingBox.Y1 = PCB_MAX_COORD; Polygon->BoundingBox.X2 = Polygon->BoundingBox.Y2 = 0; PCB_POLY_POINT_LOOP(Polygon); { Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 5044) +++ trunk/src/obj_text.c (revision 5045) @@ -131,7 +131,7 @@ /* calculate size of the bounding box */ for (; s && *s; s++) { - if (*s <= MAX_FONTPOSITION && symbol[*s].Valid) { + if (*s <= PCB_MAX_FONTPOSITION && symbol[*s].Valid) { pcb_line_t *line = symbol[*s].Line; for (i = 0; i < symbol[*s].LineN; line++, i++) { /* Clamp the width of text lines at the minimum thickness. @@ -250,7 +250,7 @@ if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text)) return (NULL); - if (value <= MAX_TEXTSCALE && value >= MIN_TEXTSCALE && value != Text->Scale) { + if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE && value != Text->Scale) { pcb_undo_add_obj_to_size(PCB_TYPE_TEXT, Layer, Text, Text); EraseText(Layer, Text); pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); @@ -477,7 +477,7 @@ while (string && *string) { /* draw lines if symbol is valid and data is present */ - if (*string <= MAX_FONTPOSITION && font->Symbol[*string].Valid) { + if (*string <= PCB_MAX_FONTPOSITION && font->Symbol[*string].Valid) { pcb_line_t *line = font->Symbol[*string].Line; pcb_line_t newline; Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 5044) +++ trunk/src/object_act.c (revision 5045) @@ -791,7 +791,7 @@ if (pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_ELEMENT, &ptr1, &ptr2, &ptr3) != PCB_TYPE_NONE) { Note.Buffer = conf_core.editor.buffer_number; - pcb_buffer_set_number(MAX_BUFFER - 1); + pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(PCB_PASTEBUFFER); pcb_copy_obj_to_buffer(PCB_PASTEBUFFER->Data, PCB->Data, PCB_TYPE_ELEMENT, ptr1, ptr2, ptr3); pcb_element_smash_buffer(PCB_PASTEBUFFER); Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 5044) +++ trunk/src/polygon.c (revision 5045) @@ -1226,7 +1226,7 @@ */ pcb_cardinal_t pcb_poly_get_lowest_distance_point(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y) { - double mindistance = (double) MAX_COORD * MAX_COORD; + double mindistance = (double) PCB_MAX_COORD * PCB_MAX_COORD; pcb_point_t *ptr1, *ptr2; pcb_cardinal_t n, result = 0; Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 5044) +++ trunk/src/rats_act.c (revision 5045) @@ -88,7 +88,7 @@ pcb_board_set_changed_flag(pcb_true); break; case F_Close: - small = PCB_SQUARE(MAX_COORD); + small = PCB_SQUARE(PCB_MAX_COORD); shorty = NULL; PCB_RAT_LOOP(PCB->Data); { Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 5044) +++ trunk/src/search.c (revision 5045) @@ -465,7 +465,7 @@ info.ptr1 = (void **) Element; info.ptr2 = (void **) Text; info.ptr3 = (void **) Dummy; - info.area = PCB_SQUARE(MAX_COORD); + info.area = PCB_SQUARE(PCB_MAX_COORD); info.BackToo = (BackToo && PCB->InvisibleObjectsOn); info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (pcb_r_search(PCB->Data->name_tree[NAME_INDEX()], &SearchBox, NULL, name_callback, &info, NULL)) @@ -510,7 +510,7 @@ info.ptr1 = (void **) Element; info.ptr2 = (void **) Dummy1; info.ptr3 = (void **) Dummy2; - info.area = PCB_SQUARE(MAX_COORD); + info.area = PCB_SQUARE(PCB_MAX_COORD); info.BackToo = (BackToo && PCB->InvisibleObjectsOn); info.locked = (locked & PCB_TYPE_LOCKED) ? 0 : PCB_FLAG_LOCK; if (pcb_r_search(PCB->Data->element_tree, &SearchBox, NULL, element_callback, &info, NULL)) Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 5044) +++ trunk/src/select_act.c (revision 5045) @@ -197,10 +197,10 @@ { pcb_box_t box; - box.X1 = -MAX_COORD; - box.Y1 = -MAX_COORD; - box.X2 = MAX_COORD; - box.Y2 = MAX_COORD; + box.X1 = -PCB_MAX_COORD; + box.Y1 = -PCB_MAX_COORD; + box.X2 = PCB_MAX_COORD; + box.Y2 = PCB_MAX_COORD; if (pcb_select_block(&box, pcb_true)) pcb_board_set_changed_flag(pcb_true); break; @@ -219,7 +219,7 @@ { pcb_coord_t x, y; Note.Buffer = conf_core.editor.buffer_number; - pcb_buffer_set_number(MAX_BUFFER - 1); + pcb_buffer_set_number(PCB_MAX_BUFFER - 1); pcb_buffer_clear(PCB_PASTEBUFFER); gui->get_coords(_("Select the Element's Mark Location"), &x, &y); x = pcb_grid_fit(x, PCB->Grid, PCB->GridOffsetX); @@ -349,10 +349,10 @@ { pcb_box_t box; - box.X1 = -MAX_COORD; - box.Y1 = -MAX_COORD; - box.X2 = MAX_COORD; - box.Y2 = MAX_COORD; + box.X1 = -PCB_MAX_COORD; + box.Y1 = -PCB_MAX_COORD; + box.X2 = PCB_MAX_COORD; + box.Y2 = PCB_MAX_COORD; if (pcb_select_block(&box, pcb_false)) pcb_board_set_changed_flag(pcb_true); break; Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 5044) +++ trunk/src_plugins/autoplace/autoplace.c (revision 5045) @@ -379,10 +379,10 @@ continue; /* initialize box so that it will take the dimensions of * the first pin/pad */ - box->X1 = MAX_COORD; - box->Y1 = MAX_COORD; - box->X2 = -MAX_COORD; - box->Y2 = -MAX_COORD; + box->X1 = PCB_MAX_COORD; + box->Y1 = PCB_MAX_COORD; + box->X2 = -PCB_MAX_COORD; + box->Y2 = -PCB_MAX_COORD; PCB_PIN_LOOP(element); { thickness = pin->Thickness / 2; @@ -519,8 +519,8 @@ } /* penalize total area used by this layout */ { - pcb_coord_t minX = MAX_COORD, minY = MAX_COORD; - pcb_coord_t maxX = -MAX_COORD, maxY = -MAX_COORD; + pcb_coord_t minX = PCB_MAX_COORD, minY = PCB_MAX_COORD; + pcb_coord_t maxX = -PCB_MAX_COORD, maxY = -PCB_MAX_COORD; PCB_ELEMENT_LOOP(PCB->Data); { PCB_MAKE_MIN(minX, element->VBox.X1); Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 5044) +++ trunk/src_plugins/autoroute/autoroute.c (revision 5045) @@ -299,7 +299,7 @@ typedef struct routedata { int max_styles; /* one rtree per layer *group */ - pcb_rtree_t *layergrouptree[MAX_LAYER]; /* no silkscreen layers here =) */ + pcb_rtree_t *layergrouptree[PCB_MAX_LAYER]; /* no silkscreen layers here =) */ /* root pointer into connectivity information */ routebox_t *first_net; /* default routing style */ @@ -401,9 +401,9 @@ */ /* group number of groups that hold surface mount pads */ static pcb_cardinal_t front, back; -static pcb_bool usedGroup[MAX_LAYER]; -static int x_cost[MAX_LAYER], y_cost[MAX_LAYER]; -static pcb_bool is_layer_group_active[MAX_LAYER]; +static pcb_bool usedGroup[PCB_MAX_LAYER]; +static int x_cost[PCB_MAX_LAYER], y_cost[PCB_MAX_LAYER]; +static pcb_bool is_layer_group_active[PCB_MAX_LAYER]; static int ro = 0; static int smoothes = 1; static int passes = 12; @@ -851,7 +851,7 @@ static routedata_t *CreateRouteData() { pcb_netlist_list_t Nets; - PointerListType layergroupboxes[MAX_LAYER]; + PointerListType layergroupboxes[PCB_MAX_LAYER]; pcb_box_t bbox; routedata_t *rd; int group, i; @@ -4064,9 +4064,9 @@ int i; pcb_box_t big; big.X1 = 0; - big.X2 = MAX_COORD; + big.X2 = PCB_MAX_COORD; big.Y1 = 0; - big.Y2 = MAX_COORD; + big.Y2 = PCB_MAX_COORD; for (i = 0; i < pcb_max_group; i++) { if (pcb_r_search(rd->layergrouptree[i], &big, NULL, bad_boy, NULL, NULL)) return pcb_false; @@ -4687,7 +4687,7 @@ gui->progress(0, 0, NULL); if (conf_core.editor.live_routing) { int i; - pcb_box_t big = { 0, 0, MAX_COORD, MAX_COORD }; + pcb_box_t big = { 0, 0, PCB_MAX_COORD, PCB_MAX_COORD }; for (i = 0; i < pcb_max_group; i++) { pcb_r_search(rd->layergrouptree[i], &big, NULL, ripout_livedraw_obj_cb, NULL, NULL); } Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 5044) +++ trunk/src_plugins/diag/diag.c (revision 5045) @@ -148,8 +148,8 @@ { int g, n, used, arr[128]; /* WARNING: this assumes we won't have more than 128 layers */ - printf("Max: theoretical=%d current_board=%d\n", MAX_LAYER+2, pcb_max_copper_layer); - for(n = 0; n < MAX_LAYER+2; n++) { + printf("Max: theoretical=%d current_board=%d\n", PCB_MAX_LAYER+2, pcb_max_copper_layer); + for(n = 0; n < PCB_MAX_LAYER+2; n++) { int grp = GetGroupOfLayer(n); printf(" [%d] %04x group=%d %s\n", n, pcb_layer_flags(n), grp, PCB->Data->Layer[n].Name); } Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 5044) +++ trunk/src_plugins/djopt/djopt.c (revision 5045) @@ -112,8 +112,8 @@ static corner_s *corners, *next_corner = 0; static line_s *lines; -static int layer_groupings[MAX_LAYER]; -static char layer_type[MAX_LAYER]; +static int layer_groupings[PCB_MAX_LAYER]; +static char layer_type[PCB_MAX_LAYER]; #define LT_COMPONENT 1 #define LT_SOLDER 2 @@ -1715,8 +1715,8 @@ int rv = 0; corner_s *c, *c2, *c3; line_s *l; - unsigned char directions[MAX_LAYER]; - unsigned char counts[MAX_LAYER]; + unsigned char directions[PCB_MAX_LAYER]; + unsigned char counts[PCB_MAX_LAYER]; memset(directions, 0, sizeof(directions)); memset(counts, 0, sizeof(counts)); @@ -2233,8 +2233,8 @@ static void pinsnap() { corner_s *c; - int best_dist[MAX_LAYER + 1]; - corner_s *best_c[MAX_LAYER + 1]; + int best_dist[PCB_MAX_LAYER + 1]; + corner_s *best_c[PCB_MAX_LAYER + 1]; int l, got_one; int left = 0, right = 0, top = 0, bottom = 0; pcb_pin_t *pin; Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 5044) +++ trunk/src_plugins/export_bboard/bboard.c (revision 5045) @@ -82,7 +82,7 @@ float z_offset; int solder; int component; -} group_data[MAX_LAYER]; +} group_data[PCB_MAX_LAYER]; #define HA_bboardfile 0 Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 5044) +++ trunk/src_plugins/export_dxf/dxf.c (revision 5045) @@ -728,7 +728,7 @@ static int lastcolor = -1; -static int print_layer[MAX_LAYER]; +static int print_layer[PCB_MAX_LAYER]; /*! * \brief The last X coordinate. @@ -4227,9 +4227,9 @@ { const char *dxf_fnbase; int i; - static int saved_layer_stack[MAX_LAYER]; + static int saved_layer_stack[PCB_MAX_LAYER]; pcb_box_t region; - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; int tmp[128], len; #if DEBUG Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 5044) +++ trunk/src_plugins/export_gcode/gcode.c (revision 5045) @@ -109,7 +109,7 @@ * Which groups of layers to export into PNG layer masks. 1 means export, 0 * means do not export. */ -static int gcode_export_group[MAX_LAYER]; +static int gcode_export_group[PCB_MAX_LAYER]; /* Group that is currently exported. */ static int gcode_cur_group; @@ -349,7 +349,7 @@ static void gcode_do_export(pcb_hid_attr_val_t * options) { - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; int i, idx; time_t t; const pcb_unit_t *unit; @@ -400,7 +400,7 @@ : PCB_INCH_TO_COORD(options[HA_toolradius].real_value * scale); gcode_choose_groups(); - for (i = 0; i < MAX_LAYER; i++) { + for (i = 0; i < PCB_MAX_LAYER; i++) { if (gcode_export_group[i]) { gcode_cur_group = i; Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 5044) +++ trunk/src_plugins/export_gerber/gerber.c (revision 5045) @@ -277,8 +277,8 @@ static int lastgroup = -1; static int lastcap = -1; static int lastcolor = -1; -static int print_group[MAX_LAYER]; -static int print_layer[MAX_LAYER]; +static int print_group[PCB_MAX_LAYER]; +static int print_layer[PCB_MAX_LAYER]; static int lastX, lastY; /* the last X and Y coordinate */ static const char *copy_outline_names[] = { @@ -501,8 +501,8 @@ { const char *fnbase; int i; - static int saved_layer_stack[MAX_LAYER]; - int save_ons[MAX_LAYER + 2]; + static int saved_layer_stack[PCB_MAX_LAYER]; + int save_ons[PCB_MAX_LAYER + 2]; conf_force_set_bool(conf_core.editor.thin_draw, 0); conf_force_set_bool(conf_core.editor.thin_draw_poly, 0); Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 5044) +++ trunk/src_plugins/export_nelma/nelma.c (revision 5045) @@ -123,7 +123,7 @@ * Which groups of layers to export into PNG layer masks. 1 means export, 0 * means do not export. */ -static int nelma_export_group[MAX_LAYER]; +static int nelma_export_group[PCB_MAX_LAYER]; /* Group that is currently exported. */ static int nelma_cur_group; @@ -257,7 +257,7 @@ fprintf(out, "\t\t\"air-bottom\""); z = 10; - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) if (nelma_export_group[i]) { idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); @@ -322,7 +322,7 @@ /* pcb_pin_name_to_xy(pin, &x, &y); */ - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) if (nelma_export_group[i]) { idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); @@ -393,7 +393,7 @@ nelma_write_layer(out, 1000, 2 * subh, "air-bottom", 0, "air"); z = 10; - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) if (nelma_export_group[i]) { idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); @@ -427,7 +427,7 @@ x = pcb_to_nelma(px); y = pcb_to_nelma(py); - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) if (nelma_export_group[i]) { idx = (i >= 0 && i < pcb_max_group) ? PCB->LayerGroups.Entries[i][0] : i; ext = pcb_layer_type_to_file_name(idx, PCB_FNS_fixed); @@ -596,7 +596,7 @@ static void nelma_do_export(pcb_hid_attr_val_t * options) { - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; int i, idx; FILE *nelma_config; char *buf; @@ -626,7 +626,7 @@ nelma_choose_groups(); - for (i = 0; i < MAX_LAYER; i++) { + for (i = 0; i < PCB_MAX_LAYER; i++) { if (nelma_export_group[i]) { nelma_cur_group = i; Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 5044) +++ trunk/src_plugins/export_openscad/scad.c (revision 5045) @@ -120,7 +120,7 @@ float z_offset; int solder; int component; -} group_data[MAX_LAYER]; +} group_data[PCB_MAX_LAYER]; #define HA_scadfile 0 Index: trunk/src_plugins/export_openscad/scad.h =================================================================== --- trunk/src_plugins/export_openscad/scad.h (revision 5044) +++ trunk/src_plugins/export_openscad/scad.h (revision 5045) @@ -91,7 +91,7 @@ #define SCAD_CUT_BOTTOM 3 #define SCAD_CUT_BOTTOM_ONLY 4 -#define MAX_LAYER_COLORS (MAX_LAYER *2) +#define MAX_LAYER_COLORS (PCB_MAX_LAYER *2) /* polygon attributes */ Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 5044) +++ trunk/src_plugins/export_png/png.c (revision 5045) @@ -112,8 +112,8 @@ static int lastgroup = -1; static gdImagePtr lastbrush = (gdImagePtr) ((void *) -1); static int lastcap = -1; -static int print_group[MAX_LAYER]; -static int print_layer[MAX_LAYER]; +static int print_group[PCB_MAX_LAYER]; +static int print_layer[PCB_MAX_LAYER]; /* For photo-mode we need the following layers as monochrome masks: @@ -127,10 +127,10 @@ #define PHOTO_FLIP_Y 2 static int photo_mode, photo_flip; -static gdImagePtr photo_copper[MAX_LAYER + 2]; +static gdImagePtr photo_copper[PCB_MAX_LAYER + 2]; static gdImagePtr photo_silk, photo_mask, photo_drill, *photo_im; static gdImagePtr photo_outline; -static int photo_groups[MAX_LAYER + 2], photo_ngroups; +static int photo_groups[PCB_MAX_LAYER + 2], photo_ngroups; static int photo_has_inners; static int doing_outline, have_outline; @@ -430,7 +430,7 @@ void png_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options) { int i; - static int saved_layer_stack[MAX_LAYER]; + static int saved_layer_stack[PCB_MAX_LAYER]; pcb_box_t region; f = the_file; @@ -599,7 +599,7 @@ static void png_do_export(pcb_hid_attr_val_t * options) { - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; int i; pcb_box_t *bbox; int w, h; Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 5044) +++ trunk/src_plugins/export_ps/eps.c (revision 5045) @@ -62,8 +62,8 @@ static pcb_coord_t linewidth = -1; static int lastcap = -1; static int lastcolor = -1; -static int print_group[MAX_LAYER]; -static int print_layer[MAX_LAYER]; +static int print_group[PCB_MAX_LAYER]; +static int print_layer[PCB_MAX_LAYER]; static int fast_erase = -1; static pcb_hid_attribute_t eps_attribute_list[] = { @@ -181,7 +181,7 @@ void eps_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options) { int i; - static int saved_layer_stack[MAX_LAYER]; + static int saved_layer_stack[PCB_MAX_LAYER]; pcb_box_t region; conf_force_set_bool(conf_core.editor.thin_draw, 0); @@ -306,7 +306,7 @@ static void eps_do_export(pcb_hid_attr_val_t * options) { int i; - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; if (!options) { eps_get_export_options(0); Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 5044) +++ trunk/src_plugins/export_ps/ps.c (revision 5045) @@ -379,8 +379,8 @@ FILE *f; int pagecount; pcb_coord_t linewidth; - pcb_bool print_group[MAX_LAYER]; - pcb_bool print_layer[MAX_LAYER]; + pcb_bool print_group[PCB_MAX_LAYER]; + pcb_bool print_layer[PCB_MAX_LAYER]; double fade_ratio; pcb_bool multi_file; pcb_coord_t media_width, media_height, ps_width, ps_height; @@ -599,7 +599,7 @@ void ps_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options) { int i; - static int saved_layer_stack[MAX_LAYER]; + static int saved_layer_stack[PCB_MAX_LAYER]; conf_force_set_bool(conf_core.editor.thin_draw, 0); conf_force_set_bool(conf_core.editor.thin_draw_poly, 0); @@ -705,7 +705,7 @@ static void ps_do_export(pcb_hid_attr_val_t * options) { FILE *fh; - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; int i; if (!options) { @@ -944,7 +944,7 @@ if (global.drill_helper) pcb_fprintf(global.f, "/dh { gsave %mi setlinewidth 0 gray %mi 0 360 arc stroke grestore} bind def\n", - (pcb_coord_t) MIN_PINORVIAHOLE, (pcb_coord_t) (MIN_PINORVIAHOLE * 3 / 2)); + (pcb_coord_t) PCB_MIN_PINORVIAHOLE, (pcb_coord_t) (PCB_MIN_PINORVIAHOLE * 3 / 2)); } #if 0 /* Try to outsmart ps2pdf's heuristics for page rotation, by putting Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 5044) +++ trunk/src_plugins/export_svg/svg.c (revision 5045) @@ -193,7 +193,7 @@ void svg_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options) { - static int saved_layer_stack[MAX_LAYER]; + static int saved_layer_stack[PCB_MAX_LAYER]; pcb_box_t region; region.X1 = 0; @@ -270,7 +270,7 @@ static void svg_do_export(pcb_hid_attr_val_t * options) { const char *filename; - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; int i; pcb_coord_t w, h, x1, y1, x2, y2; Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 5044) +++ trunk/src_plugins/fontmode/fontmode.c (revision 5045) @@ -92,7 +92,7 @@ MoveLayerToGroup(l, l); } PCB->MaxWidth = CELL_SIZE * 18; - PCB->MaxHeight = CELL_SIZE * ((MAX_FONTPOSITION + 15) / 16 + 2); + PCB->MaxHeight = CELL_SIZE * ((PCB_MAX_FONTPOSITION + 15) / 16 + 2); PCB->Grid = PCB_MIL_TO_COORD(5); PCB->Data->Layer[0].Name = pcb_strdup("Font"); PCB->Data->Layer[1].Name = pcb_strdup("OrigFont"); @@ -107,7 +107,7 @@ lgrid = PCB->Data->Layer + 3; font = &PCB->Font; - for (s = 0; s <= MAX_FONTPOSITION; s++) { + for (s = 0; s <= PCB_MAX_FONTPOSITION; s++) { pcb_coord_t ox = (s % 16 + 1) * CELL_SIZE; pcb_coord_t oy = (s / 16 + 1) * CELL_SIZE; pcb_coord_t w, miny, maxy, maxx = 0; @@ -140,7 +140,7 @@ int x = (l + 1) * CELL_SIZE; pcb_line_new_merge(lgrid, x, 0, x, PCB->MaxHeight, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); } - for (l = 0; l <= MAX_FONTPOSITION / 16 + 1; l++) { + for (l = 0; l <= PCB_MAX_FONTPOSITION / 16 + 1; l++) { int y = (l + 1) * CELL_SIZE; pcb_line_new_merge(lgrid, 0, y, PCB->MaxWidth, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags()); } @@ -168,7 +168,7 @@ lfont = PCB->Data->Layer + 0; lwidth = PCB->Data->Layer + 2; - for (i = 0; i <= MAX_FONTPOSITION; i++) { + for (i = 0; i <= PCB_MAX_FONTPOSITION; i++) { font->Symbol[i].LineN = 0; font->Symbol[i].Valid = 0; font->Symbol[i].Width = 0; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c (revision 5044) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c (revision 5045) @@ -12,7 +12,7 @@ /* TODO */ -#define MAX_LAYER 16 +#define PCB_MAX_LAYER 16 pcb_hid_attribute_t *gpmi_hid_get_export_options(int *num) { @@ -53,7 +53,7 @@ void gpmi_hid_do_export(pcb_hid_attr_val_t * options) { gpmi_hid_t *h = hid_gpmi_data_get(exporter); - int save_ons[MAX_LAYER + 2]; + int save_ons[PCB_MAX_LAYER + 2]; pcb_box_t region; h->result = options; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 5044) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c (revision 5045) @@ -8,7 +8,7 @@ #include "src/layer.h" #define layer_check(layer) \ - if ((layer < 0) || (layer >= MAX_LAYER+2)) \ + if ((layer < 0) || (layer >= PCB_MAX_LAYER+2)) \ return @@ -29,7 +29,7 @@ int n; if (name == NULL) return -2; - for(n = 0; n < MAX_LAYER + 2; n++) + for(n = 0; n < PCB_MAX_LAYER + 2; n++) if ((PCB->Data->Layer[n].Name != NULL) && (strcmp(PCB->Data->Layer[n].Name, name) == 0)) return n; return -1; @@ -37,7 +37,7 @@ int layout_get_max_possible_layer() { - return MAX_LAYER+2; + return PCB_MAX_LAYER+2; } int layout_get_max_copper_layer() Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/page.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/page.c (revision 5044) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/page.c (revision 5045) @@ -14,6 +14,6 @@ void layout_set_page_size(int width, int height) { - pcb_board_resize(MIN(MAX_COORD, MAX(width, MIN_SIZE)), MIN(MAX_COORD, MAX(height, MIN_SIZE))); + pcb_board_resize(MIN(PCB_MAX_COORD, MAX(width, PCB_MIN_SIZE)), MIN(PCB_MAX_COORD, MAX(height, PCB_MIN_SIZE))); } Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 5044) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c (revision 5045) @@ -92,7 +92,7 @@ if (obj_types & OM_POLYGON) { s->searching = OM_POLYGON; - for (s->layer = 0; s->layer < MAX_LAYER + 2; s->layer++) + for (s->layer = 0; s->layer < PCB_MAX_LAYER + 2; s->layer++) pcb_r_search(PCB->Data->Layer[s->layer].polygon_tree, &spot, NULL, search_callback, s, NULL); s->layer = -1; } @@ -133,7 +133,7 @@ layout_search_t *s = new_search(search_ID); pcb_layer_t *layer = PCB->Data->Layer; - for (l =0; l < MAX_LAYER + 2; l++, layer++) { + for (l =0; l < PCB_MAX_LAYER + 2; l++, layer++) { s->layer = l; select2(s, OM_ARC, flag, &layer->Arc); select2(s, OM_LINE, flag, &layer->Line); Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 5044) +++ trunk/src_plugins/hid_batch/batch.c (revision 5045) @@ -87,10 +87,10 @@ pcb_printf("Size: %ml x %ml mils, %mm x %mm mm\n", PCB->MaxWidth, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight); cg = GetLayerGroupNumberByNumber(pcb_component_silk_layer); sg = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - for (i = 0; i < MAX_LAYER; i++) { + for (i = 0; i < PCB_MAX_LAYER; i++) { int lg = GetLayerGroupNumberByNumber(i); - for (j = 0; j < MAX_LAYER; j++) + 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/ghid-route-style-selector.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-route-style-selector.c (revision 5044) +++ trunk/src_plugins/hid_gtk/ghid-route-style-selector.c (revision 5045) @@ -232,12 +232,12 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2); gtk_table_attach(GTK_TABLE(table), dialog_data.name_entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2); - _table_attach(table, 1, _("Line width:"), &dialog_data.line_entry, MIN_LINESIZE, MAX_LINESIZE); + _table_attach(table, 1, _("Line width:"), &dialog_data.line_entry, PCB_MIN_LINESIZE, PCB_MAX_LINESIZE); _table_attach(table, 2, _("Via hole size:"), - &dialog_data.via_hole_entry, MIN_PINORVIAHOLE, MAX_PINORVIASIZE - MIN_PINORVIACOPPER); + &dialog_data.via_hole_entry, PCB_MIN_PINORVIAHOLE, PCB_MAX_PINORVIASIZE - PCB_MIN_PINORVIACOPPER); _table_attach(table, 3, _("Via ring size:"), - &dialog_data.via_size_entry, MIN_PINORVIAHOLE + MIN_PINORVIACOPPER, MAX_PINORVIASIZE); - _table_attach(table, 4, _("Clearance:"), &dialog_data.clearance_entry, MIN_LINESIZE, MAX_LINESIZE); + &dialog_data.via_size_entry, PCB_MIN_PINORVIAHOLE + PCB_MIN_PINORVIACOPPER, PCB_MAX_PINORVIASIZE); + _table_attach(table, 4, _("Clearance:"), &dialog_data.clearance_entry, PCB_MIN_LINESIZE, PCB_MAX_LINESIZE); /* create delete button */ button = gtk_button_new_with_label (_("Delete Style")); Index: trunk/src_plugins/hid_gtk/gui-config.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-config.c (revision 5044) +++ trunk/src_plugins/hid_gtk/gui-config.c (revision 5045) @@ -588,10 +588,10 @@ new_board_width = PCB->MaxWidth; new_board_height = PCB->MaxHeight; ghid_table_coord_entry(table, 0, 0, NULL, - PCB->MaxWidth, MIN_SIZE, MAX_COORD, CE_LARGE, 0, coord_entry_cb, &new_board_width, FALSE, _("Width")); + PCB->MaxWidth, PCB_MIN_SIZE, PCB_MAX_COORD, CE_LARGE, 0, coord_entry_cb, &new_board_width, FALSE, _("Width")); ghid_table_coord_entry(table, 1, 0, NULL, - PCB->MaxHeight, MIN_SIZE, MAX_COORD, + PCB->MaxHeight, PCB_MIN_SIZE, PCB_MAX_COORD, CE_LARGE, 0, coord_entry_cb, &new_board_height, FALSE, _("Height")); /* ---- Text Scale ---- */ @@ -604,7 +604,7 @@ gtk_table_set_row_spacings(GTK_TABLE(table), 3); ghid_table_spin_button(table, 0, 0, &config_text_spin_button, conf_core.design.text_scale, - MIN_TEXTSCALE, MAX_TEXTSCALE, 10.0, 10.0, 0, 0, text_spin_button_cb, NULL, FALSE, "%"); + PCB_MIN_TEXTSCALE, PCB_MAX_TEXTSCALE, 10.0, 10.0, 0, 0, text_spin_button_cb, NULL, FALSE, "%"); /* ---- DRC Sizes ---- */ @@ -617,27 +617,27 @@ gtk_table_set_row_spacings(GTK_TABLE(table), 3); ghid_table_coord_entry(table, 0, 0, NULL, - PCB->Bloat, MIN_DRC_VALUE, MAX_DRC_VALUE, + PCB->Bloat, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE, CE_SMALL, 0, coord_entry_cb, &PCB->Bloat, FALSE, _("Minimum copper spacing")); ghid_table_coord_entry(table, 1, 0, NULL, - PCB->minWid, MIN_DRC_VALUE, MAX_DRC_VALUE, + PCB->minWid, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE, CE_SMALL, 0, coord_entry_cb, &PCB->minWid, FALSE, _("Minimum copper width")); ghid_table_coord_entry(table, 2, 0, NULL, - PCB->Shrink, MIN_DRC_VALUE, MAX_DRC_VALUE, + PCB->Shrink, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE, CE_SMALL, 0, coord_entry_cb, &PCB->Shrink, FALSE, _("Minimum touching copper overlap")); ghid_table_coord_entry(table, 3, 0, NULL, - PCB->minSlk, MIN_DRC_VALUE, MAX_DRC_VALUE, + PCB->minSlk, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE, CE_SMALL, 0, coord_entry_cb, &PCB->minSlk, FALSE, _("Minimum silk width")); ghid_table_coord_entry(table, 4, 0, NULL, - PCB->minDrill, MIN_DRC_VALUE, MAX_DRC_VALUE, + PCB->minDrill, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE, CE_SMALL, 0, coord_entry_cb, &PCB->minDrill, FALSE, _("Minimum drill diameter")); ghid_table_coord_entry(table, 5, 0, NULL, - PCB->minRing, MIN_DRC_VALUE, MAX_DRC_VALUE, + PCB->minRing, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE, CE_SMALL, 0, coord_entry_cb, &PCB->minRing, FALSE, _("Minimum annular ring")); vbox = gtk_vbox_new(TRUE, 0); @@ -1183,10 +1183,10 @@ */ static GtkWidget *config_groups_table, *config_groups_vbox, *config_groups_window; -static GtkWidget *layer_entry[MAX_LAYER]; -static GtkWidget *group_button[MAX_LAYER + 2][MAX_LAYER]; +static GtkWidget *layer_entry[PCB_MAX_LAYER]; +static GtkWidget *group_button[PCB_MAX_LAYER + 2][PCB_MAX_LAYER]; -static gint config_layer_group[MAX_LAYER + 2]; +static gint config_layer_group[PCB_MAX_LAYER + 2]; static pcb_layer_group_t layer_groups, /* Working copy */ *lg_monitor; /* Keep track if our working copy */ Index: trunk/src_plugins/hid_gtk/gui.h =================================================================== --- trunk/src_plugins/hid_gtk/gui.h (revision 5044) +++ trunk/src_plugins/hid_gtk/gui.h (revision 5045) @@ -48,15 +48,15 @@ | gui code in gui-top-window.c and group code in misc.c must agree | on what layer is what! */ -#define LAYER_BUTTON_SILK MAX_LAYER -#define LAYER_BUTTON_RATS (MAX_LAYER + 1) +#define LAYER_BUTTON_SILK PCB_MAX_LAYER +#define LAYER_BUTTON_RATS (PCB_MAX_LAYER + 1) #define N_SELECTABLE_LAYER_BUTTONS (LAYER_BUTTON_RATS + 1) -#define LAYER_BUTTON_PINS (MAX_LAYER + 2) -#define LAYER_BUTTON_VIAS (MAX_LAYER + 3) -#define LAYER_BUTTON_FARSIDE (MAX_LAYER + 4) -#define LAYER_BUTTON_MASK (MAX_LAYER + 5) -#define N_LAYER_BUTTONS (MAX_LAYER + 6) +#define LAYER_BUTTON_PINS (PCB_MAX_LAYER + 2) +#define LAYER_BUTTON_VIAS (PCB_MAX_LAYER + 3) +#define LAYER_BUTTON_FARSIDE (PCB_MAX_LAYER + 4) +#define LAYER_BUTTON_MASK (PCB_MAX_LAYER + 5) +#define N_LAYER_BUTTONS (PCB_MAX_LAYER + 6) /* Go from from the grid units in use (millimeters or mils) to PCB units | and back again. Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 5044) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 5045) @@ -1212,16 +1212,16 @@ static Widget layer_groups_form = 0; static Widget lg_buttonform = 0; -static int lg_setcol[MAX_LAYER + 2]; +static int lg_setcol[PCB_MAX_LAYER + 2]; static int lg_width, lg_height; -static int lg_r[MAX_LAYER + 3]; -static int lg_c[MAX_LAYER + 1]; +static int lg_r[PCB_MAX_LAYER + 3]; +static int lg_c[PCB_MAX_LAYER + 1]; static int lg_label_width, lg_fa, lg_fd; static GC lg_gc = 0; #if 0 -static Widget lglabels[MAX_LAYER + 2]; -static Widget lgbuttons[MAX_LAYER + 2][MAX_LAYER]; +static Widget lglabels[PCB_MAX_LAYER + 2]; +static Widget lgbuttons[PCB_MAX_LAYER + 2][PCB_MAX_LAYER]; #endif typedef struct { @@ -1338,7 +1338,7 @@ void lesstif_update_layer_groups() { - int sets[MAX_LAYER + 2][MAX_LAYER]; + int sets[PCB_MAX_LAYER + 2][PCB_MAX_LAYER]; int i, j; pcb_layer_group_t *l = &(PCB->LayerGroups); @@ -1398,8 +1398,8 @@ } } XtUnmanageChild(lg_buttonform); - for (i = 0; i < MAX_LAYER + 2; i++) - for (j = 0; j < MAX_LAYER; j++) { + for (i = 0; i < PCB_MAX_LAYER + 2; i++) + for (j = 0; j < PCB_MAX_LAYER; j++) { if (i < pcb_max_copper_layer + 2 && j < pcb_max_group) { XtManageChild(lgbuttons[i][j]); stdarg_n = 0; @@ -1461,10 +1461,10 @@ XtGetSubresources(layer_groups_form, &lgr, "layergroups", "LayerGroups", lg_resources, XtNumber(lg_resources), 0, 0); #if 0 - stdarg(XmNfractionBase, pcb_max_group * (MAX_LAYER + 2)); + stdarg(XmNfractionBase, pcb_max_group * (PCB_MAX_LAYER + 2)); lg_buttonform = XmCreateForm(layer_groups_form, "lgbutton", stdarg_args, stdarg_n); - for (i = 0; i < MAX_LAYER + 2; i++) { + for (i = 0; i < PCB_MAX_LAYER + 2; i++) { stdarg_n = 0; stdarg(XmNleftAttachment, XmATTACH_FORM); stdarg(XmNtopAttachment, XmATTACH_POSITION); @@ -1476,16 +1476,16 @@ lglabels[i] = XmCreateLabel(layer_groups_form, "layer", stdarg_args, stdarg_n); XtManageChild(lglabels[i]); - for (j = 0; j < MAX_LAYER; j++) { + for (j = 0; j < PCB_MAX_LAYER; j++) { stdarg_n = 0; stdarg(XmNleftAttachment, XmATTACH_POSITION); - stdarg(XmNleftPosition, j * (MAX_LAYER + 2)); + stdarg(XmNleftPosition, j * (PCB_MAX_LAYER + 2)); stdarg(XmNrightAttachment, XmATTACH_POSITION); - stdarg(XmNrightPosition, (j + 1) * (MAX_LAYER + 2)); + stdarg(XmNrightPosition, (j + 1) * (PCB_MAX_LAYER + 2)); stdarg(XmNtopAttachment, XmATTACH_POSITION); - stdarg(XmNtopPosition, i * MAX_LAYER); + stdarg(XmNtopPosition, i * PCB_MAX_LAYER); stdarg(XmNbottomAttachment, XmATTACH_POSITION); - stdarg(XmNbottomPosition, (i + 1) * MAX_LAYER); + stdarg(XmNbottomPosition, (i + 1) * PCB_MAX_LAYER); stdarg(XmNlabelString, XmStringCreatePCB(" ")); stdarg(XmNspacing, 0); stdarg(XmNvisibleWhenOff, True); Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 5044) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 5045) @@ -56,15 +56,15 @@ /*-----------------------------------------------------------------------------*/ -#define LB_SILK (MAX_LAYER+0) -#define LB_RATS (MAX_LAYER+1) +#define LB_SILK (PCB_MAX_LAYER+0) +#define LB_RATS (PCB_MAX_LAYER+1) #define LB_NUMPICK (LB_RATS+1) /* more */ -#define LB_PINS (MAX_LAYER+2) -#define LB_VIAS (MAX_LAYER+3) -#define LB_BACK (MAX_LAYER+4) -#define LB_MASK (MAX_LAYER+5) -#define LB_NUM (MAX_LAYER+6) +#define LB_PINS (PCB_MAX_LAYER+2) +#define LB_VIAS (PCB_MAX_LAYER+3) +#define LB_BACK (PCB_MAX_LAYER+4) +#define LB_MASK (PCB_MAX_LAYER+5) +#define LB_NUM (PCB_MAX_LAYER+6) typedef struct { Widget w[LB_NUM]; @@ -88,7 +88,7 @@ return 0; if (PCB && PCB->Data) { pcb_data_t *d = PCB->Data; - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) fg_colors[i] = lesstif_parse_color(d->Layer[i].Color); fg_colors[LB_SILK] = lesstif_parse_color(PCB->ElementColor); fg_colors[LB_RATS] = lesstif_parse_color(PCB->RatColor); @@ -99,7 +99,7 @@ bg_color = lesstif_parse_color(conf_core.appearance.color.background); } else { - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) fg_colors[i] = lesstif_parse_color(conf_core.appearance.color.layer[i]); fg_colors[LB_SILK] = lesstif_parse_color(conf_core.appearance.color.element); fg_colors[LB_RATS] = lesstif_parse_color(conf_core.appearance.color.rat); @@ -145,7 +145,7 @@ } stdarg_n = 0; - if (i < MAX_LAYER && PCB->Data->Layer[i].Name) { + if (i < PCB_MAX_LAYER && PCB->Data->Layer[i].Name) { XmString s = XmStringCreatePCB(PCB->Data->Layer[i].Name); stdarg(XmNlabelString, s); } @@ -167,7 +167,7 @@ } XtSetValues(lb->w[i], stdarg_args, stdarg_n); - if (i >= pcb_max_copper_layer && i < MAX_LAYER) + if (i >= pcb_max_copper_layer && i < PCB_MAX_LAYER) XtUnmanageChild(lb->w[i]); else XtManageChild(lb->w[i]); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 5044) +++ trunk/src_plugins/io_lihata/write.c (revision 5045) @@ -548,7 +548,7 @@ syms = lht_dom_node_alloc(LHT_HASH, "symbols"); lht_dom_hash_put(ndt, syms); - for(n = 0; n < MAX_FONTPOSITION + 1; n++) { + for(n = 0; n < PCB_MAX_FONTPOSITION + 1; n++) { char sname[32]; if (!font->Symbol[n].Valid) continue; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 5044) +++ trunk/src_plugins/io_pcb/file.c (revision 5045) @@ -271,7 +271,7 @@ pcb_line_t *line; pcb_font_t *font; - for (font = &PCB->Font, i = 0; i <= MAX_FONTPOSITION; i++) { + for (font = &PCB->Font, i = 0; i <= PCB_MAX_FONTPOSITION; i++) { if (!font->Symbol[i].Valid) continue; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 5044) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 5045) @@ -125,7 +125,7 @@ static pcb_symbol_t *Symbol; static int pin_num; static pcb_lib_menu_t *Menu; -static pcb_bool LayerFlag[MAX_LAYER + 2]; +static pcb_bool LayerFlag[PCB_MAX_LAYER + 2]; extern char *yytext; /* defined by LEX */ extern pcb_board_t * yyPCB; @@ -1798,7 +1798,7 @@ pcb_message(PCB_MSG_ERROR, "illegal fileformat\n"); YYABORT; } - for (i = 0; i < MAX_LAYER + 2; i++) + for (i = 0; i < PCB_MAX_LAYER + 2; i++) LayerFlag[i] = pcb_false; yyFont = &yyPCB->Font; yyData = yyPCB->Data; @@ -1867,7 +1867,7 @@ pcb_message(PCB_MSG_ERROR, "illegal fileformat\n"); YYABORT; } - for (i = 0; i < MAX_LAYER + 2; i++) + for (i = 0; i < PCB_MAX_LAYER + 2; i++) LayerFlag[i] = pcb_false; yyData->LayerN = 0; } @@ -1886,7 +1886,7 @@ YYABORT; } yyFont->Valid = pcb_false; - for (i = 0; i <= MAX_FONTPOSITION; i++) + for (i = 0; i <= PCB_MAX_FONTPOSITION; i++) free (yyFont->Symbol[i].Line); memset(yyFont->Symbol, 0, sizeof(yyFont->Symbol)); } @@ -1917,8 +1917,8 @@ #line 330 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-1].string); - yyPCB->MaxWidth = MAX_COORD; - yyPCB->MaxHeight = MAX_COORD; + yyPCB->MaxWidth = PCB_MAX_COORD; + yyPCB->MaxHeight = PCB_MAX_COORD; } #line 1924 "parse_y.c" /* yacc.c:1646 */ break; @@ -2165,8 +2165,8 @@ case 69: #line 781 "parse_y.y" /* yacc.c:1646 */ { - pcb_via_new(yyData, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, - OU((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); + pcb_via_new(yyData, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME, + OU((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2173 "parse_y.c" /* yacc.c:1646 */ @@ -2175,15 +2175,15 @@ case 70: #line 791 "parse_y.y" /* yacc.c:1646 */ { - pcb_coord_t hole = (OU((yyvsp[-3].measure)) * DEFAULT_DRILLINGHOLE); + pcb_coord_t hole = (OU((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE); /* make sure that there's enough copper left */ - if (OU((yyvsp[-3].measure)) - hole < MIN_PINORVIACOPPER && - OU((yyvsp[-3].measure)) > MIN_PINORVIACOPPER) - hole = OU((yyvsp[-3].measure)) - MIN_PINORVIACOPPER; + if (OU((yyvsp[-3].measure)) - hole < PCB_MIN_PINORVIACOPPER && + OU((yyvsp[-3].measure)) > PCB_MIN_PINORVIACOPPER) + hole = OU((yyvsp[-3].measure)) - PCB_MIN_PINORVIACOPPER; - pcb_via_new(yyData, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*GROUNDPLANEFRAME, - OU((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); + pcb_via_new(yyData, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*PCB_GROUNDPLANEFRAME, + OU((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2190 "parse_y.c" /* yacc.c:1646 */ @@ -2210,7 +2210,7 @@ case 73: #line 863 "parse_y.y" /* yacc.c:1646 */ { - if ((yyvsp[-4].integer) <= 0 || (yyvsp[-4].integer) > MAX_LAYER + 2) + if ((yyvsp[-4].integer) <= 0 || (yyvsp[-4].integer) > PCB_MAX_LAYER + 2) { yyerror("Layernumber out of range"); YYABORT; @@ -2274,7 +2274,7 @@ /* eliminate old-style rat-lines */ if ((IV ((yyvsp[-1].measure)) & PCB_FLAG_RAT) == 0) pcb_line_new(Layer, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), - 200*GROUNDPLANEFRAME, pcb_flag_old(IV ((yyvsp[-1].measure)))); + 200*PCB_GROUNDPLANEFRAME, pcb_flag_old(IV ((yyvsp[-1].measure)))); } #line 2280 "parse_y.c" /* yacc.c:1646 */ break; @@ -2301,7 +2301,7 @@ #line 1031 "parse_y.y" /* yacc.c:1646 */ { pcb_arc_new(Layer, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-6].measure)), IV ((yyvsp[-3].measure)), (yyvsp[-2].number), - OU ((yyvsp[-4].measure)), 200*GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer))); + OU ((yyvsp[-4].measure)), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer))); } #line 2307 "parse_y.c" /* yacc.c:1646 */ break; @@ -2661,8 +2661,8 @@ case 155: #line 1580 "parse_y.y" /* yacc.c:1646 */ { - pcb_element_pin_new(yyElement, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-5].measure)) + 2*MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); + pcb_element_pin_new(yyElement, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*PCB_GROUNDPLANEFRAME, + OU ((yyvsp[-5].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } @@ -2675,8 +2675,8 @@ char p_number[8]; sprintf(p_number, "%d", pin_num++); - pcb_element_pin_new(yyElement, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer))); + pcb_element_pin_new(yyElement, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME, + OU ((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } @@ -2686,17 +2686,17 @@ case 157: #line 1607 "parse_y.y" /* yacc.c:1646 */ { - pcb_coord_t hole = OU ((yyvsp[-3].measure)) * DEFAULT_DRILLINGHOLE; + pcb_coord_t hole = OU ((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE; char p_number[8]; /* make sure that there's enough copper left */ - if (OU ((yyvsp[-3].measure)) - hole < MIN_PINORVIACOPPER && - OU ((yyvsp[-3].measure)) > MIN_PINORVIACOPPER) - hole = OU ((yyvsp[-3].measure)) - MIN_PINORVIACOPPER; + if (OU ((yyvsp[-3].measure)) - hole < PCB_MIN_PINORVIACOPPER && + OU ((yyvsp[-3].measure)) > PCB_MIN_PINORVIACOPPER) + hole = OU ((yyvsp[-3].measure)) - PCB_MIN_PINORVIACOPPER; sprintf(p_number, "%d", pin_num++); - pcb_element_pin_new(yyElement, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer))); + pcb_element_pin_new(yyElement, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*PCB_GROUNDPLANEFRAME, + OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2703 "parse_y.c" /* yacc.c:1646 */ @@ -2732,8 +2732,8 @@ case 160: #line 1688 "parse_y.y" /* yacc.c:1646 */ { - pcb_element_pad_new(yyElement,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-4].measure)) + 2*MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); + pcb_element_pad_new(yyElement,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME, + OU ((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } @@ -2746,8 +2746,8 @@ char p_number[8]; sprintf(p_number, "%d", pin_num++); - pcb_element_pad_new(yyElement,OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)),OU ((yyvsp[-3].measure)), 2*GROUNDPLANEFRAME, - OU ((yyvsp[-3].measure)) + 2*MASKFRAME, (yyvsp[-2].string),p_number, pcb_flag_old((yyvsp[-1].integer))); + pcb_element_pad_new(yyElement,OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)),OU ((yyvsp[-3].measure)), 2*PCB_GROUNDPLANEFRAME, + OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, (yyvsp[-2].string),p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } #line 2754 "parse_y.c" /* yacc.c:1646 */ @@ -2768,7 +2768,7 @@ case 167: #line 1740 "parse_y.y" /* yacc.c:1646 */ { - if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > MAX_FONTPOSITION) + if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION) { yyerror("fontposition out of range"); YYABORT; @@ -2788,7 +2788,7 @@ case 168: #line 1756 "parse_y.y" /* yacc.c:1646 */ { - if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > MAX_FONTPOSITION) + if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION) { yyerror("fontposition out of range"); YYABORT; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 5044) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 5045) @@ -62,7 +62,7 @@ static pcb_symbol_t *Symbol; static int pin_num; static pcb_lib_menu_t *Menu; -static pcb_bool LayerFlag[MAX_LAYER + 2]; +static pcb_bool LayerFlag[PCB_MAX_LAYER + 2]; extern char *yytext; /* defined by LEX */ extern pcb_board_t * yyPCB; @@ -172,7 +172,7 @@ pcb_message(PCB_MSG_ERROR, "illegal fileformat\n"); YYABORT; } - for (i = 0; i < MAX_LAYER + 2; i++) + for (i = 0; i < PCB_MAX_LAYER + 2; i++) LayerFlag[i] = pcb_false; yyFont = &yyPCB->Font; yyData = yyPCB->Data; @@ -240,7 +240,7 @@ pcb_message(PCB_MSG_ERROR, "illegal fileformat\n"); YYABORT; } - for (i = 0; i < MAX_LAYER + 2; i++) + for (i = 0; i < PCB_MAX_LAYER + 2; i++) LayerFlag[i] = pcb_false; yyData->LayerN = 0; } @@ -264,7 +264,7 @@ YYABORT; } yyFont->Valid = pcb_false; - for (i = 0; i <= MAX_FONTPOSITION; i++) + for (i = 0; i <= PCB_MAX_FONTPOSITION; i++) free (yyFont->Symbol[i].Line); memset(yyFont->Symbol, 0, sizeof(yyFont->Symbol)); } @@ -329,8 +329,8 @@ : T_PCB '(' STRING ')' { yyPCB->Name = $3; - yyPCB->MaxWidth = MAX_COORD; - yyPCB->MaxHeight = MAX_COORD; + yyPCB->MaxWidth = PCB_MAX_COORD; + yyPCB->MaxHeight = PCB_MAX_COORD; } | T_PCB '(' STRING measure measure ')' { @@ -779,8 +779,8 @@ /* x, y, thickness, drilling-hole, name, flags */ : T_VIA '(' measure measure measure measure STRING INTEGER ')' { - pcb_via_new(yyData, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU($5) + 2*MASKFRAME, OU ($6), $7, pcb_flag_old($8)); + pcb_via_new(yyData, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME, + OU($5) + 2*PCB_MASKFRAME, OU ($6), $7, pcb_flag_old($8)); free ($7); } ; @@ -789,15 +789,15 @@ /* old format: x, y, thickness, name, flags */ : T_VIA '(' measure measure measure STRING INTEGER ')' { - pcb_coord_t hole = (OU($5) * DEFAULT_DRILLINGHOLE); + pcb_coord_t hole = (OU($5) * PCB_DEFAULT_DRILLINGHOLE); /* make sure that there's enough copper left */ - if (OU($5) - hole < MIN_PINORVIACOPPER && - OU($5) > MIN_PINORVIACOPPER) - hole = OU($5) - MIN_PINORVIACOPPER; + if (OU($5) - hole < PCB_MIN_PINORVIACOPPER && + OU($5) > PCB_MIN_PINORVIACOPPER) + hole = OU($5) - PCB_MIN_PINORVIACOPPER; - pcb_via_new(yyData, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU($5) + 2*MASKFRAME, hole, $6, pcb_flag_old($7)); + pcb_via_new(yyData, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME, + OU($5) + 2*PCB_MASKFRAME, hole, $6, pcb_flag_old($7)); free ($6); } ; @@ -861,7 +861,7 @@ /* name */ : T_LAYER '(' INTEGER STRING opt_string ')' '(' { - if ($3 <= 0 || $3 > MAX_LAYER + 2) + if ($3 <= 0 || $3 > PCB_MAX_LAYER + 2) { yyerror("Layernumber out of range"); YYABORT; @@ -966,7 +966,7 @@ /* eliminate old-style rat-lines */ if ((IV ($8) & PCB_FLAG_RAT) == 0) pcb_line_new(Layer, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7), - 200*GROUNDPLANEFRAME, pcb_flag_old(IV ($8))); + 200*PCB_GROUNDPLANEFRAME, pcb_flag_old(IV ($8))); } ; @@ -1030,7 +1030,7 @@ : T_ARC '(' measure measure measure measure measure measure number INTEGER ')' { pcb_arc_new(Layer, OU ($3), OU ($4), OU ($5), OU ($5), IV ($8), $9, - OU ($7), 200*GROUNDPLANEFRAME, pcb_flag_old($10)); + OU ($7), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old($10)); } ; @@ -1578,8 +1578,8 @@ /* x, y, thickness, drilling hole, name, number, flags */ : T_PIN '(' measure measure measure measure STRING STRING INTEGER ')' { - pcb_element_pin_new(yyElement, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU ($5) + 2*MASKFRAME, OU ($6), $7, $8, pcb_flag_old($9)); + pcb_element_pin_new(yyElement, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME, + OU ($5) + 2*PCB_MASKFRAME, OU ($6), $7, $8, pcb_flag_old($9)); free ($7); free ($8); } @@ -1592,8 +1592,8 @@ char p_number[8]; sprintf(p_number, "%d", pin_num++); - pcb_element_pin_new(yyElement, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU ($5) + 2*MASKFRAME, OU ($6), $7, p_number, pcb_flag_old($8)); + pcb_element_pin_new(yyElement, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME, + OU ($5) + 2*PCB_MASKFRAME, OU ($6), $7, p_number, pcb_flag_old($8)); free ($7); } @@ -1605,17 +1605,17 @@ */ : T_PIN '(' measure measure measure STRING INTEGER ')' { - pcb_coord_t hole = OU ($5) * DEFAULT_DRILLINGHOLE; + pcb_coord_t hole = OU ($5) * PCB_DEFAULT_DRILLINGHOLE; char p_number[8]; /* make sure that there's enough copper left */ - if (OU ($5) - hole < MIN_PINORVIACOPPER && - OU ($5) > MIN_PINORVIACOPPER) - hole = OU ($5) - MIN_PINORVIACOPPER; + if (OU ($5) - hole < PCB_MIN_PINORVIACOPPER && + OU ($5) > PCB_MIN_PINORVIACOPPER) + hole = OU ($5) - PCB_MIN_PINORVIACOPPER; sprintf(p_number, "%d", pin_num++); - pcb_element_pin_new(yyElement, OU ($3), OU ($4), OU ($5), 2*GROUNDPLANEFRAME, - OU ($5) + 2*MASKFRAME, hole, $6, p_number, pcb_flag_old($7)); + pcb_element_pin_new(yyElement, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME, + OU ($5) + 2*PCB_MASKFRAME, hole, $6, p_number, pcb_flag_old($7)); free ($6); } ; @@ -1686,8 +1686,8 @@ /* x1, y1, x2, y2, thickness, name , pad number, flags */ : T_PAD '(' measure measure measure measure measure STRING STRING INTEGER ')' { - pcb_element_pad_new(yyElement,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*GROUNDPLANEFRAME, - OU ($7) + 2*MASKFRAME, $8, $9, pcb_flag_old($10)); + pcb_element_pad_new(yyElement,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*PCB_GROUNDPLANEFRAME, + OU ($7) + 2*PCB_MASKFRAME, $8, $9, pcb_flag_old($10)); free ($8); free ($9); } @@ -1700,8 +1700,8 @@ char p_number[8]; sprintf(p_number, "%d", pin_num++); - pcb_element_pad_new(yyElement,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*GROUNDPLANEFRAME, - OU ($7) + 2*MASKFRAME, $8,p_number, pcb_flag_old($9)); + pcb_element_pad_new(yyElement,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*PCB_GROUNDPLANEFRAME, + OU ($7) + 2*PCB_MASKFRAME, $8,p_number, pcb_flag_old($9)); free ($8); } ; @@ -1738,7 +1738,7 @@ symbolhead : T_SYMBOL '[' symbolid measure ']' '(' { - if ($3 <= 0 || $3 > MAX_FONTPOSITION) + if ($3 <= 0 || $3 > PCB_MAX_FONTPOSITION) { yyerror("fontposition out of range"); YYABORT; @@ -1754,7 +1754,7 @@ } | T_SYMBOL '(' symbolid measure ')' '(' { - if ($3 <= 0 || $3 > MAX_FONTPOSITION) + if ($3 <= 0 || $3 > PCB_MAX_FONTPOSITION) { yyerror("fontposition out of range"); YYABORT; Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 5044) +++ trunk/src_plugins/jostle/jostle.c (revision 5045) @@ -190,7 +190,7 @@ default: /* diagonal case */ { int kx, ky, minmax, dq, ckx, cky; - pcb_coord_t mm[2] = { MAX_COORD, -MAX_COORD }; + pcb_coord_t mm[2] = { PCB_MAX_COORD, -PCB_MAX_COORD }; pcb_vector_t mmp[2]; pcb_vnode_t *v; Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 5044) +++ trunk/src_plugins/vendordrill/vendor.c (revision 5045) @@ -393,8 +393,8 @@ pcb_message(PCB_MSG_DEFAULT, _ ("Adjusted %s routing style via hole size to be %6.2f mils\n"), PCB->RouteStyle[i].Name, 0.01 * PCB->RouteStyle[i].Hole); - if (PCB->RouteStyle[i].Diameter < PCB->RouteStyle[i].Hole + MIN_PINORVIACOPPER) { - PCB->RouteStyle[i].Diameter = PCB->RouteStyle[i].Hole + MIN_PINORVIACOPPER; + if (PCB->RouteStyle[i].Diameter < PCB->RouteStyle[i].Hole + PCB_MIN_PINORVIACOPPER) { + PCB->RouteStyle[i].Diameter = PCB->RouteStyle[i].Hole + PCB_MIN_PINORVIACOPPER; pcb_message(PCB_MSG_DEFAULT, _ ("Increased %s routing style via diameter to %6.2f mils\n"), PCB->RouteStyle[i].Name, 0.01 * PCB->RouteStyle[i].Diameter); Index: trunk/tests/strflags/tester.c =================================================================== --- trunk/tests/strflags/tester.c (revision 5044) +++ trunk/tests/strflags/tester.c (revision 5045) @@ -39,7 +39,7 @@ { int l; printf("F:%08x T:[", f->f); - for (l = 0; l < (MAX_LAYER + 7) / 8; l++) + for (l = 0; l < (PCB_MAX_LAYER + 7) / 8; l++) printf(" %02x", f->t[l]); printf("]"); } @@ -100,7 +100,7 @@ } if (otype & PCB_TYPEMASK_PIN) - for (i = 0; i < MAX_LAYER; i++) + for (i = 0; i < PCB_MAX_LAYER; i++) if (random() & 4) PCB_FLAG_THERM_ASSIGN(i, 3, &fh);