Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 31011) +++ trunk/scconfig/Rev.h (revision 31012) @@ -1 +1 @@ -static const int myrev = 31008; +static const int myrev = 31012; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 31011) +++ trunk/scconfig/Rev.tab (revision 31012) @@ -1,4 +1,4 @@ -31008 configure pcb_ -> rnd_ renames in librnd +31012 configure pcb_ -> rnd_ renames in librnd 30779 configure remove distaligntext - all cases handled by distalign properly 30754 configure remove the old import_sch plugin (in favor of import_sch2) 30753 configure disable the old drc, enable the new drc Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 31011) +++ trunk/src/Makefile.in (revision 31012) @@ -95,7 +95,7 @@ $(LIBRND)/core/main_act.o $(LIBRND)/core/misc_util.o $(LIBRND)/core/paths.o - $(LIBRND)/core/pcb_bool.o + $(LIBRND)/core/rnd_bool.o $(LIBRND)/core/rnd_printf.o $(LIBRND)/core/plugins.o $(LIBRND)/core/pixmap.o Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 31011) +++ trunk/src/change.h (revision 31012) @@ -34,7 +34,7 @@ #include "config.h" #include "board.h" #include "flag.h" -#include +#include #include extern int defer_updates, defer_needs_update; Index: trunk/src/librnd/core/pcb_bool.c =================================================================== --- trunk/src/librnd/core/pcb_bool.c (revision 31011) +++ trunk/src/librnd/core/pcb_bool.c (nonexistent) @@ -1,38 +0,0 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * Copyright (C) 2017 Tibor 'Igor2' Palinkas - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact: - * Project page: http://repo.hu/projects/pcb-rnd - * lead developer: http://repo.hu/projects/pcb-rnd/contact.html - * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") - */ - -#include -#include -#include - -rnd_bool_op_t rnd_str2boolop(const char *s) -{ - if (rnd_strcasecmp(s, "set") == 0) return RND_BOOL_SET; - if (rnd_strcasecmp(s, "clear") == 0) return RND_BOOL_CLEAR; - if (rnd_strcasecmp(s, "toggle") == 0) return RND_BOOL_TOGGLE; - if (rnd_strcasecmp(s, "preserve") == 0) return RND_BOOL_PRESERVE; - return RND_BOOL_INVALID; -} Index: trunk/src/librnd/core/box.h =================================================================== --- trunk/src/librnd/core/box.h (revision 31011) +++ trunk/src/librnd/core/box.h (revision 31012) @@ -45,7 +45,7 @@ #include #include #include -#include +#include struct rnd_rnd_box_list_s { rnd_cardinal_t BoxN; /* the number of boxes contained */ Index: trunk/src/librnd/core/global_typedefs.h =================================================================== --- trunk/src/librnd/core/global_typedefs.h (revision 31011) +++ trunk/src/librnd/core/global_typedefs.h (revision 31012) @@ -79,6 +79,6 @@ typedef long int rnd_layer_id_t; typedef long int rnd_layergrp_id_t; -#include +#include #endif Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 31011) +++ trunk/src/librnd/core/grid.c (revision 31012) @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include rnd_coord_t rnd_grid_fit(rnd_coord_t x, rnd_coord_t grid_spacing, rnd_coord_t grid_offset) Index: trunk/src/librnd/core/grid.h =================================================================== --- trunk/src/librnd/core/grid.h (revision 31011) +++ trunk/src/librnd/core/grid.h (revision 31012) @@ -31,7 +31,7 @@ #define RND_GRID_H #include -#include +#include #include #include Index: trunk/src/librnd/core/misc_util.h =================================================================== --- trunk/src/librnd/core/misc_util.h (revision 31011) +++ trunk/src/librnd/core/misc_util.h (revision 31012) @@ -32,7 +32,7 @@ #define RND_MISC_UTIL_H #include -#include +#include double rnd_distance(double x1, double y1, double x2, double y2); double rnd_distance2(double x1, double y1, double x2, double y2); /* distance square */ Index: trunk/src/librnd/core/pcb_bool.h =================================================================== --- trunk/src/librnd/core/pcb_bool.h (revision 31011) +++ trunk/src/librnd/core/pcb_bool.h (revision 31012) @@ -1,61 +1,2 @@ -/* - * COPYRIGHT - * - * pcb-rnd, interactive printed circuit board design - * Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact: - * Project page: http://repo.hu/projects/pcb-rnd - * lead developer: http://repo.hu/projects/pcb-rnd/contact.html - * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") - */ - -#ifndef RND_BOOL_H -#define RND_BOOL_H -/* Because stdbool is not c89 */ -typedef int rnd_bool; -typedef enum rnd_bool_e { - rnd_false = 0, - rnd_true = 1 -} rnd_bool_t; - - - /* for arguments optionally changing the value of a bool */ -typedef enum rnd_bool_op_e { - RND_BOOL_CLEAR = 0, - RND_BOOL_SET = 1, - RND_BOOL_TOGGLE = -1, - RND_BOOL_PRESERVE = -2, - RND_BOOL_INVALID = -8 -} rnd_bool_op_t; - -/* changes the value of rnd_bool dst as requested by rnd_bool_op_t op - WARNING: evaluates dst multiple times */ -#define rnd_bool_op(dst, op) \ -do { \ - switch(op) { \ - case RND_BOOL_CLEAR: (dst) = 0; break; \ - case RND_BOOL_SET: (dst) = 1; break; \ - case RND_BOOL_TOGGLE: (dst) = !(dst); break; \ - case RND_BOOL_INVALID: \ - case RND_BOOL_PRESERVE: break; \ - } \ -} while(0) - -rnd_bool_op_t rnd_str2boolop(const char *s); - -#endif +/* Provided temporarily, for compatibility */ +#include Index: trunk/src/librnd/core/rnd_bool.c =================================================================== --- trunk/src/librnd/core/rnd_bool.c (nonexistent) +++ trunk/src/librnd/core/rnd_bool.c (revision 31012) @@ -0,0 +1,38 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * Copyright (C) 2017 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Contact: + * Project page: http://repo.hu/projects/pcb-rnd + * lead developer: http://repo.hu/projects/pcb-rnd/contact.html + * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") + */ + +#include +#include +#include + +rnd_bool_op_t rnd_str2boolop(const char *s) +{ + if (rnd_strcasecmp(s, "set") == 0) return RND_BOOL_SET; + if (rnd_strcasecmp(s, "clear") == 0) return RND_BOOL_CLEAR; + if (rnd_strcasecmp(s, "toggle") == 0) return RND_BOOL_TOGGLE; + if (rnd_strcasecmp(s, "preserve") == 0) return RND_BOOL_PRESERVE; + return RND_BOOL_INVALID; +} Index: trunk/src/librnd/core/rnd_bool.h =================================================================== --- trunk/src/librnd/core/rnd_bool.h (nonexistent) +++ trunk/src/librnd/core/rnd_bool.h (revision 31012) @@ -0,0 +1,61 @@ +/* + * COPYRIGHT + * + * pcb-rnd, interactive printed circuit board design + * Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Contact: + * Project page: http://repo.hu/projects/pcb-rnd + * lead developer: http://repo.hu/projects/pcb-rnd/contact.html + * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") + */ + +#ifndef RND_BOOL_H +#define RND_BOOL_H +/* Because stdbool is not c89 */ +typedef int rnd_bool; +typedef enum rnd_bool_e { + rnd_false = 0, + rnd_true = 1 +} rnd_bool_t; + + + /* for arguments optionally changing the value of a bool */ +typedef enum rnd_bool_op_e { + RND_BOOL_CLEAR = 0, + RND_BOOL_SET = 1, + RND_BOOL_TOGGLE = -1, + RND_BOOL_PRESERVE = -2, + RND_BOOL_INVALID = -8 +} rnd_bool_op_t; + +/* changes the value of rnd_bool dst as requested by rnd_bool_op_t op + WARNING: evaluates dst multiple times */ +#define rnd_bool_op(dst, op) \ +do { \ + switch(op) { \ + case RND_BOOL_CLEAR: (dst) = 0; break; \ + case RND_BOOL_SET: (dst) = 1; break; \ + case RND_BOOL_TOGGLE: (dst) = !(dst); break; \ + case RND_BOOL_INVALID: \ + case RND_BOOL_PRESERVE: break; \ + } \ +} while(0) + +rnd_bool_op_t rnd_str2boolop(const char *s); + +#endif Index: trunk/src/librnd/core/tool.h =================================================================== --- trunk/src/librnd/core/tool.h (revision 31011) +++ trunk/src/librnd/core/tool.h (revision 31012) @@ -30,7 +30,7 @@ #include #include -#include +#include typedef int pcb_toolid_t; #define PCB_TOOLID_INVALID (-1) Index: trunk/src/stub_draw.h =================================================================== --- trunk/src/stub_draw.h (revision 31011) +++ trunk/src/stub_draw.h (revision 31012) @@ -32,7 +32,7 @@ #define PCB_STUB_DRAW_FAB_H #include -#include +#include #include #include "draw.h" Index: trunk/src/undo.h =================================================================== --- trunk/src/undo.h (revision 31011) +++ trunk/src/undo.h (revision 31012) @@ -73,7 +73,7 @@ void undo_dump(void); /* temporary */ -#include +#include extern pcb_data_t *pcb_removelist; extern rnd_bool pcb_undo_and_draw; Index: trunk/src_plugins/io_dsn/read.c =================================================================== --- trunk/src_plugins/io_dsn/read.c (revision 31011) +++ trunk/src_plugins/io_dsn/read.c (revision 31012) @@ -37,7 +37,7 @@ #include "data.h" #include "plug_io.h" #include -#include +#include #include #include #include "layer_grp.h" Index: trunk/src_plugins/io_dsn/write.c =================================================================== --- trunk/src_plugins/io_dsn/write.c (revision 31011) +++ trunk/src_plugins/io_dsn/write.c (revision 31012) @@ -30,7 +30,7 @@ #include "plug_io.h" #include -#include +#include #include "board.h" #include "data.h" #include "layer.h" Index: trunk/src_plugins/io_hyp/parser.h =================================================================== --- trunk/src_plugins/io_hyp/parser.h (revision 31011) +++ trunk/src_plugins/io_hyp/parser.h (revision 31012) @@ -22,7 +22,7 @@ #define PCB_IO_HYP_PARSER_H #include -#include +#include #include "board.h" /* Index: trunk/src_plugins/io_hyp/write.h =================================================================== --- trunk/src_plugins/io_hyp/write.h (revision 31011) +++ trunk/src_plugins/io_hyp/write.h (revision 31012) @@ -1,5 +1,5 @@ #include -#include +#include #include "plug_io.h" int io_hyp_write_pcb(pcb_plug_io_t * ctx, FILE * f, const char *old_filename, const char *new_filename, rnd_bool emergency); Index: trunk/src_plugins/lib_gtk_common/bu_command.h =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_command.h (revision 31011) +++ trunk/src_plugins/lib_gtk_common/bu_command.h (revision 31012) @@ -3,7 +3,7 @@ #include #include -#include +#include #include typedef struct pcb_gtk_command_s { Index: trunk/src_plugins/lib_gtk_common/pcb_gtk.h =================================================================== --- trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 31011) +++ trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 31012) @@ -138,7 +138,7 @@ #include #include -#include +#include struct pcb_gtk_pixmap_s { rnd_pixmap_t *pxm; /* core-side pixmap (raw input image) */ Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.h =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.h (revision 31011) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.h (revision 31012) @@ -30,7 +30,7 @@ #ifndef PCB_LIB_GTK_COMMON_UI_ZOOMPAN_H #define PCB_LIB_GTK_COMMON_UI_ZOOMPAN_H -#include +#include #define SIDE_X_(hidlib, x) ((rnd_conf.editor.view.flip_x ? hidlib->size_x - (x) : (x))) #define SIDE_Y_(hidlib, y) ((rnd_conf.editor.view.flip_y ? hidlib->size_y - (y) : (y))) Index: trunk/src_plugins/shape/shape.h =================================================================== --- trunk/src_plugins/shape/shape.h (revision 31011) +++ trunk/src_plugins/shape/shape.h (revision 31012) @@ -29,7 +29,7 @@ #include "board.h" #include "data.h" #include "layer.h" -#include +#include /* special layer: when used, the shape is always placed on the current layer */ extern pcb_layer_t *pcb_shape_current_layer; Index: trunk/tests/pcb-printf/prcli.c =================================================================== --- trunk/tests/pcb-printf/prcli.c (revision 31011) +++ trunk/tests/pcb-printf/prcli.c (revision 31012) @@ -2,7 +2,7 @@ #include #include #include -#include +#include int main(int argc, char *argv[]) { Index: trunk/tests/pcb-printf/prclimq.c =================================================================== --- trunk/tests/pcb-printf/prclimq.c (revision 31011) +++ trunk/tests/pcb-printf/prclimq.c (revision 31012) @@ -2,7 +2,7 @@ #include #include #include -#include +#include int main(int argc, char *argv[]) {