Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5038) +++ trunk/doc-rnd/hacking/renames (revision 5039) @@ -961,3 +961,9 @@ max_copper_layer -> pcb_max_copper_layer solder_silk_layer -> pcb_solder_silk_layer component_silk_layer -> pcb_component_silk_layer +Buffers -> pcb_buffers +addedLines -> pcb_added_lines +LayerStack -> pcb_layer_stack +Bumped -> pcb_bumped +STATUS_OK -> 0 +STATUS_ERROR -> -1 Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 5038) +++ trunk/src/action_helper.c (revision 5039) @@ -411,7 +411,7 @@ pcb_undo_restore_serial(); if (pcb_select_block(&box, pcb_true)) pcb_board_set_changed_flag(pcb_true); - else if (Bumped) + else if (pcb_bumped) pcb_undo_inc_serial(); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST; } @@ -667,7 +667,7 @@ pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = bx->Y2; pcb_undo_add_obj_to_create(PCB_TYPE_ARC, CURRENT, arc, arc); pcb_undo_inc_serial(); - addedLines++; + pcb_added_lines++; DrawArc(CURRENT, arc); pcb_draw(); pcb_crosshair.AttachedBox.State = PCB_CH_STATE_THIRD; @@ -757,7 +757,7 @@ if (PCB->RatDraw) { pcb_rat_t *line; if ((line = pcb_rat_add_net())) { - addedLines++; + pcb_added_lines++; pcb_undo_add_obj_to_create(PCB_TYPE_RATLINE, line, line, line); pcb_undo_inc_serial(); DrawRat(line); @@ -806,7 +806,7 @@ (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) != NULL) { pcb_pin_t *via; - addedLines++; + pcb_added_lines++; pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line); DrawLine(CURRENT, line); /* place a via if vias are visible, the layer is @@ -844,7 +844,7 @@ 2 * conf_core.design.clearance, pcb_flag_make((conf_core.editor.auto_drc ? PCB_FLAG_FOUND : 0) | (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) != NULL) { - addedLines++; + pcb_added_lines++; pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, line, line); pcb_undo_inc_serial(); DrawLine(CURRENT, line); @@ -1031,7 +1031,7 @@ memset(&pcb_crosshair.AttachedPolygon, 0, sizeof(pcb_polygon_t)); pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; - addedLines = 0; + pcb_added_lines = 0; break; } Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 5038) +++ trunk/src/buffer.c (revision 5039) @@ -385,7 +385,7 @@ int i; for (i = 0; i < MAX_BUFFER; i++) - Buffers[i].Data = pcb_buffer_new(); + pcb_buffers[i].Data = pcb_buffer_new(); } void pcb_uninit_buffers(void) @@ -393,8 +393,8 @@ int i; for (i = 0; i < MAX_BUFFER; i++) { - pcb_buffer_clear(Buffers+i); - free(Buffers[i].Data); + pcb_buffer_clear(pcb_buffers+i); + free(pcb_buffers[i].Data); } } @@ -580,7 +580,7 @@ int i; for (i = 0; i < MAX_BUFFER; i++) - pcb_buffer_swap(&Buffers[i]); + pcb_buffer_swap(&pcb_buffers[i]); pcb_crosshair_range_to_buffer(); } Index: trunk/src/buffer.h =================================================================== --- trunk/src/buffer.h (revision 5038) +++ trunk/src/buffer.h (revision 5039) @@ -72,6 +72,6 @@ /* --------------------------------------------------------------------------- * access macro for current buffer */ -#define PCB_PASTEBUFFER (&Buffers[conf_core.editor.buffer_number]) +#define PCB_PASTEBUFFER (&pcb_buffers[conf_core.editor.buffer_number]) #endif Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 5038) +++ trunk/src/crosshair.c (revision 5039) @@ -1302,7 +1302,7 @@ return; recursing = pcb_true; pcb_notify_crosshair_change(pcb_false); - addedLines = 0; + pcb_added_lines = 0; pcb_crosshair.AttachedObject.Type = PCB_TYPE_NONE; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; pcb_crosshair.AttachedPolygon.PointN = 0; Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 5038) +++ trunk/src/data.c (revision 5039) @@ -37,12 +37,12 @@ /* --------------------------------------------------------------------------- * some shared identifiers */ -int LayerStack[MAX_LAYER]; /* determines the layer draw order */ +int pcb_layer_stack[MAX_LAYER]; /* determines the layer draw order */ -pcb_buffer_t Buffers[MAX_BUFFER]; /* my buffers */ -pcb_bool Bumped; /* if the undo serial number has changed */ +pcb_buffer_t pcb_buffers[MAX_BUFFER]; /* my buffers */ +pcb_bool pcb_bumped; /* if the undo serial number has changed */ -int addedLines; +int pcb_added_lines; /* callback based loops */ Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 5038) +++ trunk/src/data.h (revision 5039) @@ -58,11 +58,11 @@ #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 Buffers[MAX_BUFFER]; -extern int addedLines; -extern int LayerStack[MAX_LAYER]; +extern pcb_buffer_t pcb_buffers[MAX_BUFFER]; +extern int pcb_added_lines; +extern int pcb_layer_stack[MAX_LAYER]; -extern pcb_bool Bumped; +extern pcb_bool pcb_bumped; /****** callback based loops *****/ Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 5038) +++ trunk/src/draw.c (revision 5039) @@ -192,7 +192,7 @@ memset(do_group, 0, sizeof(do_group)); for (ngroups = 0, i = 0; i < pcb_max_copper_layer; i++) { pcb_layer_t *l = LAYER_ON_STACK(i); - int group = GetLayerGroupNumberByNumber(LayerStack[i]); + int group = GetLayerGroupNumberByNumber(pcb_layer_stack[i]); if (l->On && !do_group[group]) { do_group[group] = 1; drawn_groups[ngroups++] = group; Index: trunk/src/error.h =================================================================== --- trunk/src/error.h (revision 5038) +++ trunk/src/error.h (revision 5039) @@ -29,11 +29,6 @@ #ifndef PCB_ERROR_H #define PCB_ERROR_H -/* Common return codes. */ -#define STATUS_OK 0 -#define STATUS_BREAK 1 -#define STATUS_ERROR -1 - typedef enum pcb_message_level { /* MSG_DEFAULT is the default level when a message is not converted yet to any of the levels below. This level will go away once all messages Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 5038) +++ trunk/src/find_misc.c (revision 5039) @@ -88,7 +88,7 @@ /* decrement 'i' to keep layerstack order */ for (i = pcb_max_copper_layer - 1; i != -1; i--) { - pcb_cardinal_t layer = LayerStack[i]; + pcb_cardinal_t layer = pcb_layer_stack[i]; if (PCB->Data->Layer[layer].On) { /* draw all new lines */ Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 5038) +++ trunk/src/layer.c (revision 5039) @@ -41,7 +41,7 @@ static struct { pcb_bool ElementOn, InvisibleObjectsOn, PinOn, ViaOn, RatOn; - int LayerStack[MAX_LAYER]; + int pcb_layer_stack[MAX_LAYER]; pcb_bool LayerOn[MAX_LAYER]; int cnt; } SavedStack; @@ -180,13 +180,13 @@ if (NewTop < pcb_max_copper_layer) { /* first find position of passed one */ for (i = 0; i < pcb_max_copper_layer; i++) - if (LayerStack[i] == NewTop) + if (pcb_layer_stack[i] == NewTop) break; /* bring this element to the top of the stack */ for (; i; i--) - LayerStack[i] = LayerStack[i - 1]; - LayerStack[0] = NewTop; + pcb_layer_stack[i] = pcb_layer_stack[i - 1]; + pcb_layer_stack[0] = NewTop; } } @@ -270,7 +270,7 @@ for (i = 0; i < pcb_max_copper_layer + 2; i++) { if (i < pcb_max_copper_layer) - LayerStack[i] = i; + pcb_layer_stack[i] = i; PCB->Data->Layer[i].On = pcb_false; } PCB->ElementOn = pcb_false; @@ -380,7 +380,7 @@ assert(PCB->Data->LayerN <= MAX_LAYER); for (i = 0; i < pcb_max_copper_layer + 2; i++) { if (i < pcb_max_copper_layer) - LayerStack[i] = i; + pcb_layer_stack[i] = i; PCB->Data->Layer[i].On = pcb_true; } PCB->ElementOn = pcb_true; @@ -414,7 +414,7 @@ for (i = 0; i < pcb_max_copper_layer + 2; i++) { if (i < pcb_max_copper_layer) - SavedStack.LayerStack[i] = LayerStack[i]; + SavedStack.pcb_layer_stack[i] = pcb_layer_stack[i]; SavedStack.LayerOn[i] = PCB->Data->Layer[i].On; } SavedStack.ElementOn = PCB->ElementOn; @@ -442,7 +442,7 @@ for (i = 0; i < pcb_max_copper_layer + 2; i++) { if (i < pcb_max_copper_layer) - LayerStack[i] = SavedStack.LayerStack[i]; + pcb_layer_stack[i] = SavedStack.pcb_layer_stack[i]; PCB->Data->Layer[i].On = SavedStack.LayerOn[i]; } PCB->ElementOn = SavedStack.ElementOn; @@ -977,9 +977,9 @@ lp->Color = conf_core.appearance.color.layer[new_index]; lp->SelectedColor = conf_core.appearance.color.layer_selected[new_index]; for (l = 0; l < pcb_max_copper_layer; l++) - if (LayerStack[l] >= new_index) - LayerStack[l]++; - LayerStack[pcb_max_copper_layer - 1] = new_index; + if (pcb_layer_stack[l] >= new_index) + pcb_layer_stack[l]++; + pcb_layer_stack[pcb_max_copper_layer - 1] = new_index; } else if (new_index == -1) { /* Delete the layer at old_index */ @@ -988,12 +988,12 @@ memset(&PCB->Data->Layer[pcb_max_copper_layer + 1], 0, sizeof(pcb_layer_t)); memmove(&groups[old_index], &groups[old_index + 1], (pcb_max_copper_layer - old_index + 2 - 1) * sizeof(int)); for (l = 0; l < pcb_max_copper_layer; l++) - if (LayerStack[l] == old_index) - memmove(LayerStack + l, LayerStack + l + 1, (pcb_max_copper_layer - l - 1) * sizeof(LayerStack[0])); + if (pcb_layer_stack[l] == old_index) + memmove(pcb_layer_stack + l, pcb_layer_stack + l + 1, (pcb_max_copper_layer - l - 1) * sizeof(pcb_layer_stack[0])); pcb_max_copper_layer--; for (l = 0; l < pcb_max_copper_layer; l++) - if (LayerStack[l] > old_index) - LayerStack[l]--; + if (pcb_layer_stack[l] > old_index) + pcb_layer_stack[l]--; } else { /* Move an existing layer */ Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 5038) +++ trunk/src/layer.h (revision 5039) @@ -89,7 +89,7 @@ /* Returns pointer to private buffer */ char *LayerGroupsToString(pcb_layer_group_t *); -#define LAYER_ON_STACK(n) (&PCB->Data->Layer[LayerStack[(n)]]) +#define LAYER_ON_STACK(n) (&PCB->Data->Layer[pcb_layer_stack[(n)]]) #define LAYER_PTR(n) (&PCB->Data->Layer[(n)]) #define CURRENT (PCB->SilkActive ? &PCB->Data->Layer[ \ (conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer)] \ @@ -96,7 +96,7 @@ : LAYER_ON_STACK(0)) #define INDEXOFCURRENT (PCB->SilkActive ? \ (conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer) \ - : LayerStack[0]) + : pcb_layer_stack[0]) #define SILKLAYER Layer[ \ (conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer)] #define BACKSILKLAYER Layer[ \ Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 5038) +++ trunk/src/plug_io.c (revision 5039) @@ -782,7 +782,7 @@ if ((fp = fopen(Filename, "w")) == NULL) { pcb_open_error_message(Filename); - return (STATUS_ERROR); + return (-1); } result = pcb_write_file(fp, thePcb, fn_tmp, Filename, fmt, emergency); @@ -827,12 +827,12 @@ printf("write to pipe \"%s\"\n", command.array); if ((fp = popen(command.array, "w")) == NULL) { pcb_popen_error_message(command.array); - return (STATUS_ERROR); + return (-1); } result = pcb_write_file(fp, thePcb, NULL, NULL, fmt, pcb_false); - return (pclose(fp) ? STATUS_ERROR : result); + return (pclose(fp) ? (-1) : result); } Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 5038) +++ trunk/src/polygon.c (revision 5039) @@ -1280,7 +1280,7 @@ case 1: pcb_crosshair.AttachedPolygon.PointN = 0; pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; - addedLines = 0; + pcb_added_lines = 0; break; /* back-up one point */ @@ -1353,7 +1353,7 @@ /* reset state of attached line */ pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST; - addedLines = 0; + pcb_added_lines = 0; /* add to undo list */ pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, CURRENT, polygon, polygon); Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 5038) +++ trunk/src/undo.c (revision 5039) @@ -1124,7 +1124,7 @@ */ void pcb_undo_save_serial(void) { - Bumped = pcb_false; + pcb_bumped = pcb_false; between_increment_and_restore = pcb_false; added_undo_between_increment_and_restore = pcb_false; SavedSerial = Serial; @@ -1142,7 +1142,7 @@ if (UndoN > 0 && UndoList[UndoN - 1].Serial == Serial) pcb_board_set_changed_flag(pcb_true); Serial++; - Bumped = pcb_true; + pcb_bumped = pcb_true; between_increment_and_restore = pcb_true; } } Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 5038) +++ trunk/src/undo_act.c (revision 5039) @@ -95,7 +95,7 @@ break; case F_Block: pcb_undo_restore_serial(); - if (Bumped) + if (pcb_bumped) pcb_undo_inc_serial(); break; } @@ -191,7 +191,7 @@ } pcb_crosshair_grid_fit(pcb_crosshair.X, pcb_crosshair.Y); pcb_adjust_attached_objects(); - if (--addedLines == 0) { + if (--pcb_added_lines == 0) { pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND; lastLayer = CURRENT; } @@ -222,7 +222,7 @@ pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = bx->X1; pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = bx->Y1; pcb_adjust_attached_objects(); - if (--addedLines == 0) + if (--pcb_added_lines == 0) pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND; } } @@ -275,7 +275,7 @@ pcb_line_t *line = linelist_last(&CURRENT->Line); pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = line->Point2.X; pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = line->Point2.Y; - addedLines++; + pcb_added_lines++; } } pcb_notify_crosshair_change(pcb_true); Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 5038) +++ trunk/src_plugins/export_dxf/dxf.c (revision 5039) @@ -4302,8 +4302,8 @@ if (!IsLayerNumEmpty(tmp[i])) print_layer[tmp[i]] = 1; - memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); - qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), dxf_layer_sort); + memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); + qsort(pcb_layer_stack, pcb_max_copper_layer, sizeof(pcb_layer_stack[0]), dxf_layer_sort); linewidth = -1; lastcap = -1; lastgroup = -1; @@ -4321,7 +4321,7 @@ c_layerapps = 0; dxf_finding_apertures = 0; pcb_hid_expose_callback(&dxf_hid, ®ion, 0); - memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); + memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); dxf_maybe_close_file(); pcb_hid_restore_layer_ons(save_ons); #if DEBUG Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 5038) +++ trunk/src_plugins/export_gerber/gerber.c (revision 5039) @@ -561,8 +561,8 @@ if (print_group[GetLayerGroupNumberByNumber(i)]) print_layer[i] = 1; - memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); - qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); + memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); + qsort(pcb_layer_stack, pcb_max_copper_layer, sizeof(pcb_layer_stack[0]), layer_sort); linewidth = -1; lastcap = -1; lastgroup = -1; @@ -585,7 +585,7 @@ finding_apertures = 0; pcb_hid_expose_callback(&gerber_hid, ®ion, 0); - memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); + memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); maybe_close_f(f); f = NULL; Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 5038) +++ trunk/src_plugins/export_png/png.c (revision 5039) @@ -459,7 +459,7 @@ if (print_group[GetLayerGroupNumberByNumber(i)]) print_layer[i] = 1; - memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); + memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); as_shown = options[HA_as_shown].int_value; if (!options[HA_as_shown].int_value) { @@ -471,7 +471,7 @@ comp_layer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); solder_layer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); + qsort(pcb_layer_stack, pcb_max_copper_layer, sizeof(pcb_layer_stack[0]), layer_sort); if (photo_mode) { int i, n = 0; @@ -515,15 +515,15 @@ if (!photo_mode && conf_core.editor.show_solder_side) { int i, j; for (i = 0, j = pcb_max_copper_layer - 1; i < j; i++, j--) { - int k = LayerStack[i]; - LayerStack[i] = LayerStack[j]; - LayerStack[j] = k; + int k = pcb_layer_stack[i]; + pcb_layer_stack[i] = pcb_layer_stack[j]; + pcb_layer_stack[j] = k; } } pcb_hid_expose_callback(&png_hid, bounds, 0); - memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); + memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); conf_update(NULL); /* restore forced sets */ } Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 5038) +++ trunk/src_plugins/export_ps/eps.c (revision 5039) @@ -244,12 +244,12 @@ eps_hid.poly_after = 1; } - memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); + memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); as_shown = options[HA_as_shown].int_value; if (!options[HA_as_shown].int_value) { comp_layer = GetLayerGroupNumberByNumber(pcb_component_silk_layer); solder_layer = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); + qsort(pcb_layer_stack, pcb_max_copper_layer, sizeof(pcb_layer_stack[0]), layer_sort); } fprintf(f, "%%!PS-Adobe-3.0 EPSF-3.0\n"); linewidth = -1; @@ -299,7 +299,7 @@ fprintf(f, "cleartomark countdictstack exch sub { end } repeat restore\n"); fprintf(f, "%%%%EOF\n"); - memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); + memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); conf_update(NULL); /* restore forced sets */ } Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 5038) +++ trunk/src_plugins/export_ps/ps.c (revision 5039) @@ -664,8 +664,8 @@ if (global.print_group[GetLayerGroupNumberByNumber(i)]) global.print_layer[i] = 1; - memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); - qsort(LayerStack, pcb_max_copper_layer, sizeof(LayerStack[0]), layer_sort); + memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); + qsort(pcb_layer_stack, pcb_max_copper_layer, sizeof(pcb_layer_stack[0]), layer_sort); global.linewidth = -1; /* reset static vars */ @@ -698,7 +698,7 @@ if (the_file) fprintf(the_file, "showpage\n"); - memcpy(LayerStack, saved_layer_stack, sizeof(LayerStack)); + memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack)); conf_update(NULL); /* restore forced sets */ } Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 5038) +++ trunk/src_plugins/export_svg/svg.c (revision 5039) @@ -203,7 +203,7 @@ f = the_file; - memcpy(saved_layer_stack, LayerStack, sizeof(LayerStack)); + memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack)); { conf_force_set_bool(conf_core.editor.thin_draw, 0); Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5038) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 5039) @@ -1322,7 +1322,7 @@ static int SwapSides(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { - int active_group = GetLayerGroupNumberByNumber(LayerStack[0]); + int active_group = GetLayerGroupNumberByNumber(pcb_layer_stack[0]); int comp_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); pcb_bool comp_on = LAYER_PTR(PCB->LayerGroups.Entries[comp_group][0])->On; Index: trunk/src_plugins/hid_gtk/gui-top-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-top-window.c (revision 5038) +++ trunk/src_plugins/hid_gtk/gui-top-window.c (revision 5039) @@ -703,7 +703,7 @@ else if (PCB->SilkActive) layer = LAYER_BUTTON_SILK; else - layer = LayerStack[0]; + layer = pcb_layer_stack[0]; ghid_layer_selector_select_layer(GHID_LAYER_SELECTOR(ghidgui->layer_selector), layer); } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 5038) +++ trunk/src_plugins/hid_lesstif/main.c (revision 5039) @@ -567,7 +567,7 @@ int old_shown_side = conf_core.editor.show_solder_side; int comp_group = GetLayerGroupNumberByNumber(pcb_component_silk_layer); int solder_group = GetLayerGroupNumberByNumber(pcb_solder_silk_layer); - int active_group = GetLayerGroupNumberByNumber(LayerStack[0]); + int active_group = GetLayerGroupNumberByNumber(pcb_layer_stack[0]); int comp_layer; int solder_layer; int comp_showing = group_showing(comp_group, &comp_layer); @@ -2819,8 +2819,8 @@ } idx = PCB->LayerGroups.Entries[group][idx]; #if 0 - if (idx == LayerStack[0] - || GetLayerGroupNumberByNumber(idx) == GetLayerGroupNumberByNumber(LayerStack[0])) + if (idx == pcb_layer_stack[0] + || GetLayerGroupNumberByNumber(idx) == GetLayerGroupNumberByNumber(pcb_layer_stack[0])) autofade = 0; else autofade = 1; Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 5038) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 5039) @@ -115,7 +115,7 @@ else if (PCB->SilkActive) current_layer = LB_SILK; else - current_layer = LayerStack[0]; + current_layer = pcb_layer_stack[0]; for (l = 0; l < num_layer_buttons; l++) { LayerButtons *lb = layer_button_list + l; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 5038) +++ trunk/src_plugins/io_kicad/write.c (revision 5039) @@ -73,7 +73,7 @@ for (i = 0; i < pcb_max_copper_layer + 2; i++) WriteLayerData(FP, i, &(buff->Data->Layer[i])); */ - return (STATUS_OK); + return (0); } /* --------------------------------------------------------------------------- @@ -454,7 +454,7 @@ free(topSilk); free(bottomSilk); free(outlineLayers); - return (STATUS_OK); + return (0); } /* --------------------------------------------------------------------------- Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 5038) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 5039) @@ -70,7 +70,7 @@ for (i = 0; i < pcb_max_copper_layer + 2; i++) WriteLayerData(FP, i, &(buff->Data->Layer[i])); */ - return (STATUS_OK); + return (0); } /* --------------------------------------------------------------------------- @@ -457,7 +457,7 @@ free(topSilk); free(bottomSilk); free(outlineLayers); - return (STATUS_OK); + return (0); } /* --------------------------------------------------------------------------- Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 5038) +++ trunk/src_plugins/io_pcb/file.c (revision 5039) @@ -507,7 +507,7 @@ io_pcb_WriteElementData(ctx, FP, buff->Data); for (i = 0; i < pcb_max_copper_layer + 2; i++) WriteLayerData(FP, i, &(buff->Data->Layer[i])); - return (STATUS_OK); + return (0); } /* --------------------------------------------------------------------------- @@ -532,7 +532,7 @@ WritePCBNetlistData(FP); WritePCBNetlistPatchData(FP); - return (STATUS_OK); + return (0); } /* ---------------------------------------------------------------------------