Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 30913) +++ trunk/scconfig/Rev.h (revision 30914) @@ -1 +1 @@ -static const int myrev = 30779; +static const int myrev = 30914; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 30913) +++ trunk/scconfig/Rev.tab (revision 30914) @@ -1,3 +1,4 @@ +30914 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/data_it.h =================================================================== --- trunk/src/data_it.h (revision 30913) +++ trunk/src/data_it.h (revision 30914) @@ -50,15 +50,15 @@ /* Start an iteration on data, looking for any object type listed in mask; returns NULL if nothing is found. The iteration is non-recursive to subcircuits */ -PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask); +RND_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask); /* Return the next object or NULL on end of iteration */ -PCB_INLINE pcb_any_obj_t *pcb_data_next(pcb_data_it_t *it); +RND_INLINE pcb_any_obj_t *pcb_data_next(pcb_data_it_t *it); /**** implementation (inlines) ****/ /* Skip to the next type; returns 0 on success, non-0 at the end of types */ -PCB_INLINE int pcb_data_it_next_type(pcb_data_it_t *it) +RND_INLINE int pcb_data_it_next_type(pcb_data_it_t *it) { if (it->remaining == 0) return 1; @@ -98,7 +98,7 @@ } while(0) -PCB_INLINE pcb_any_obj_t *pcb_data_next(pcb_data_it_t *it) +RND_INLINE pcb_any_obj_t *pcb_data_next(pcb_data_it_t *it) { retry:; @@ -130,7 +130,7 @@ goto retry; /* ... on the new layer */ } -PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask) +RND_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask) { it->data = data; it->mask = it->remaining = mask & PCB_DATA_IT_TYPES; Index: trunk/src/draw_wireframe.h =================================================================== --- trunk/src/draw_wireframe.h (revision 30913) +++ trunk/src/draw_wireframe.h (revision 30914) @@ -34,7 +34,7 @@ /*----------------------------------------------------------- * Draws the outline of an arc */ -PCB_INLINE void pcb_draw_wireframe_arc(pcb_hid_gc_t gc, pcb_arc_t *arc, rnd_coord_t thick) +RND_INLINE void pcb_draw_wireframe_arc(pcb_hid_gc_t gc, pcb_arc_t *arc, rnd_coord_t thick) { rnd_coord_t wid = thick / 2; rnd_coord_t x1, y1, x2, y2; @@ -58,7 +58,7 @@ /*----------------------------------------------------------- * Draws the outline of a line */ -PCB_INLINE void pcb_draw_wireframe_line(pcb_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick, int square) +RND_INLINE void pcb_draw_wireframe_line(pcb_hid_gc_t gc, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick, int square) { if((x1 != x2) || (y1 != y2)) { double dx = x2 - x1; Index: trunk/src/extobj.c =================================================================== --- trunk/src/extobj.c (revision 30913) +++ trunk/src/extobj.c (revision 30914) @@ -97,7 +97,7 @@ vtp0_uninit(&pcb_extobj_i2o); } -PCB_INLINE pcb_data_t *pcb_extobj_parent_data(pcb_any_obj_t *obj) +RND_INLINE pcb_data_t *pcb_extobj_parent_data(pcb_any_obj_t *obj) { if (obj->parent_type == PCB_PARENT_DATA) return obj->parent.data; Index: trunk/src/extobj.h =================================================================== --- trunk/src/extobj.h (revision 30913) +++ trunk/src/extobj.h (revision 30914) @@ -78,7 +78,7 @@ /* Called to remove the subc of an edit object floater; returns 0 on no action, 1 if it removed an extobj subc */ -PCB_INLINE int pcb_extobj_del_floater(pcb_any_obj_t *edit_obj); +RND_INLINE int pcb_extobj_del_floater(pcb_any_obj_t *edit_obj); /* called (by the subc code) before an edit-obj is removed */ @@ -108,7 +108,7 @@ extern int pcb_extobj_invalid; /* this changes upon each new extobj reg, forcing the caches to be invalidated eventually */ extern vtp0_t pcb_extobj_i2o; /* extobj_idx -> (pcb_ext_obj_t *) */ -PCB_INLINE pcb_extobj_t *pcb_extobj_get(pcb_subc_t *obj) +RND_INLINE pcb_extobj_t *pcb_extobj_get(pcb_subc_t *obj) { pcb_extobj_t **eo; @@ -129,7 +129,7 @@ return *eo; } -PCB_INLINE void pcb_extobj_chg_attr(pcb_any_obj_t *obj, const char *key, const char *value) +RND_INLINE void pcb_extobj_chg_attr(pcb_any_obj_t *obj, const char *key, const char *value) { pcb_subc_t *subc = (pcb_subc_t *)obj; pcb_extobj_t *eo; @@ -142,7 +142,7 @@ eo->chg_attr(subc, key, value); } -PCB_INLINE pcb_subc_t *pcb_extobj_get_floater_subc(pcb_any_obj_t *flt) +RND_INLINE pcb_subc_t *pcb_extobj_get_floater_subc(pcb_any_obj_t *flt) { pcb_subc_t *subc; pcb_extobj_t *eo; @@ -161,7 +161,7 @@ return subc; } -PCB_INLINE int pcb_extobj_del_floater(pcb_any_obj_t *flt) +RND_INLINE int pcb_extobj_del_floater(pcb_any_obj_t *flt) { pcb_subc_t *subc; pcb_extobj_t *eo; @@ -193,7 +193,7 @@ return 0; } -PCB_INLINE void pcb_extobj_float_new(pcb_any_obj_t *flt) +RND_INLINE void pcb_extobj_float_new(pcb_any_obj_t *flt) { pcb_subc_t *subc = pcb_obj_parent_subc(flt); pcb_extobj_t *eo; @@ -217,7 +217,7 @@ } } -PCB_INLINE pcb_any_obj_t *pcb_extobj_float_pre(pcb_any_obj_t *flt) +RND_INLINE pcb_any_obj_t *pcb_extobj_float_pre(pcb_any_obj_t *flt) { pcb_subc_t *subc; pcb_extobj_t *eo; @@ -239,7 +239,7 @@ return NULL; } -PCB_INLINE void pcb_extobj_float_geo(pcb_any_obj_t *flt) +RND_INLINE void pcb_extobj_float_geo(pcb_any_obj_t *flt) { pcb_subc_t *subc; pcb_extobj_t *eo; @@ -257,7 +257,7 @@ eo->float_geo(subc, flt); } -PCB_INLINE void pcb_extobj_subc_geo(pcb_subc_t *subc) +RND_INLINE void pcb_extobj_subc_geo(pcb_subc_t *subc) { pcb_extobj_t *eo; Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 30913) +++ trunk/src/extobj_helper.h (revision 30914) @@ -34,17 +34,17 @@ /*** API ***/ /* Convert an attribute to coord, return 0 on success */ -PCB_INLINE int pcb_extobj_unpack_coord(const pcb_subc_t *obj, rnd_coord_t *res, const char *name); -PCB_INLINE int pcb_extobj_unpack_int(const pcb_subc_t *obj, int *res, const char *name); +RND_INLINE int pcb_extobj_unpack_coord(const pcb_subc_t *obj, rnd_coord_t *res, const char *name); +RND_INLINE int pcb_extobj_unpack_int(const pcb_subc_t *obj, int *res, const char *name); /* Wrap the update/re-generation of an extobject-subc in this begin/end to make sure bbox and undo are updated properly. The end() call always returns 0. */ -PCB_INLINE void pcb_exto_regen_begin(pcb_subc_t *subc); -PCB_INLINE int pcb_exto_regen_end(pcb_subc_t *subc); +RND_INLINE void pcb_exto_regen_begin(pcb_subc_t *subc); +RND_INLINE int pcb_exto_regen_end(pcb_subc_t *subc); /*** implementation ***/ -PCB_INLINE int pcb_extobj_unpack_coord(const pcb_subc_t *obj, rnd_coord_t *res, const char *name) +RND_INLINE int pcb_extobj_unpack_coord(const pcb_subc_t *obj, rnd_coord_t *res, const char *name) { double v; rnd_bool succ; @@ -59,7 +59,7 @@ return -1; } -PCB_INLINE int pcb_extobj_unpack_int(const pcb_subc_t *obj, int *res, const char *name) +RND_INLINE int pcb_extobj_unpack_int(const pcb_subc_t *obj, int *res, const char *name) { long l; char *end; @@ -74,7 +74,7 @@ return -1; } -PCB_INLINE void pcb_exto_regen_begin(pcb_subc_t *subc) +RND_INLINE void pcb_exto_regen_begin(pcb_subc_t *subc) { pcb_data_t *data = subc->parent.data; if (data->subc_tree != NULL) @@ -82,7 +82,7 @@ pcb_undo_freeze_add(); } -PCB_INLINE int pcb_exto_regen_end(pcb_subc_t *subc) +RND_INLINE int pcb_exto_regen_end(pcb_subc_t *subc) { pcb_data_t *data = subc->parent.data; @@ -94,7 +94,7 @@ return 0; } -PCB_INLINE pcb_subc_t *pcb_exto_create(pcb_data_t *dst, const char *eoname, const pcb_dflgmap_t *layers, rnd_coord_t ox, rnd_coord_t oy, rnd_bool on_bottom, pcb_subc_t *copy_from) +RND_INLINE pcb_subc_t *pcb_exto_create(pcb_data_t *dst, const char *eoname, const pcb_dflgmap_t *layers, rnd_coord_t ox, rnd_coord_t oy, rnd_bool on_bottom, pcb_subc_t *copy_from) { pcb_subc_t *subc = pcb_subc_alloc(); pcb_board_t *pcb = NULL; @@ -128,7 +128,7 @@ return subc; } -PCB_INLINE void pcb_exto_draw_mark(pcb_draw_info_t *info, pcb_subc_t *subc) +RND_INLINE void pcb_exto_draw_mark(pcb_draw_info_t *info, pcb_subc_t *subc) { rnd_coord_t x, y, unit = PCB_SUBC_AUX_UNIT; @@ -145,7 +145,7 @@ /*** dialog box build ***/ -PCB_INLINE void pcb_exto_dlg_gui_chg_attr(pcb_subc_t *subc, pcb_hid_attribute_t *attr, const char *newval) /* for internal use */ +RND_INLINE void pcb_exto_dlg_gui_chg_attr(pcb_subc_t *subc, pcb_hid_attribute_t *attr, const char *newval) /* for internal use */ { pcb_board_t *pcb; pcb_data_t *data; @@ -162,7 +162,7 @@ pcb_gui->invalidate_all(pcb_gui); } -PCB_INLINE void pcb_exto_dlg_coord_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) +RND_INLINE void pcb_exto_dlg_coord_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pcb_subc_t *subc = caller_data; char tmp[128]; @@ -200,7 +200,7 @@ /* pcb_dad_spin_set_value(spin->cmp.wend, NULL, wid, &hv); \*/ -PCB_INLINE void pcb_exto_dlg_str_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) +RND_INLINE void pcb_exto_dlg_str_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pcb_subc_t *subc = caller_data; pcb_exto_dlg_gui_chg_attr(subc, attr, attr->val.str); @@ -222,7 +222,7 @@ PCB_DAD_DEFAULT_PTR(dlg, currval); \ } while(0) -PCB_INLINE void pcb_exto_dlg_int_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) +RND_INLINE void pcb_exto_dlg_int_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { pcb_subc_t *subc = caller_data; char tmp[128]; Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 30913) +++ trunk/src/find_geo.c (revision 30914) @@ -53,7 +53,7 @@ /* This is required for fullpoly: whether an object bbox intersects a poly bbox can't be determined by a single contour check because there might be multiple contours. Returns 1 if obj bbox intersects any island's bbox */ -PCB_INLINE int box_isc_poly_any_island_bbox(const pcb_find_t *ctx, const rnd_box_t *box, const pcb_poly_t *poly, int first_only) +RND_INLINE int box_isc_poly_any_island_bbox(const pcb_find_t *ctx, const rnd_box_t *box, const pcb_poly_t *poly, int first_only) { pcb_poly_it_t it; pcb_polyarea_t *pa; @@ -75,7 +75,7 @@ can't be determined by a single contour check because there might be multiple contours. Returns 1 if obj's poly intersects any island's. Frees objpoly at the end. */ -PCB_INLINE int box_isc_poly_any_island_free(pcb_polyarea_t *objpoly, const pcb_poly_t *poly, int first_only) +RND_INLINE int box_isc_poly_any_island_free(pcb_polyarea_t *objpoly, const pcb_poly_t *poly, int first_only) { pcb_poly_it_t it; pcb_polyarea_t *pa; @@ -829,7 +829,7 @@ /* returns whether a round-cap pcb line touches a polygon; assumes bounding boxes do touch */ -PCB_INLINE pcb_bool_t pcb_isc_line_polyline(const pcb_find_t *ctx, pcb_pline_t *pl, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick) +RND_INLINE pcb_bool_t pcb_isc_line_polyline(const pcb_find_t *ctx, pcb_pline_t *pl, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t thick) { rnd_coord_t ox, oy, vx, vy; double dx, dy, h, l; @@ -948,7 +948,7 @@ } -PCB_INLINE pcb_bool_t pcb_isc_pstk_arc_shp(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_arc_t *arc, pcb_pstk_shape_t *shape) +RND_INLINE pcb_bool_t pcb_isc_pstk_arc_shp(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_arc_t *arc, pcb_pstk_shape_t *shape) { if (shape == NULL) goto noshape; @@ -998,7 +998,7 @@ return pcb_false; } -PCB_INLINE pcb_bool_t pcb_isc_pstk_arc(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_arc_t *arc) +RND_INLINE pcb_bool_t pcb_isc_pstk_arc(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_arc_t *arc) { pcb_pstk_shape_t *shape; pcb_pstk_proto_t *proto; @@ -1018,7 +1018,7 @@ } -PCB_INLINE pcb_polyarea_t *pcb_pstk_shp_poly2area(pcb_pstk_t *ps, pcb_pstk_shape_t *shape) +RND_INLINE pcb_polyarea_t *pcb_pstk_shp_poly2area(pcb_pstk_t *ps, pcb_pstk_shape_t *shape) { int n; pcb_pline_t *pl; @@ -1043,7 +1043,7 @@ return shp; } -PCB_INLINE pcb_bool_t pcb_isc_pstk_poly_shp(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_poly_t *poly, pcb_pstk_shape_t *shape) +RND_INLINE pcb_bool_t pcb_isc_pstk_poly_shp(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_poly_t *poly, pcb_pstk_shape_t *shape) { if (shape == NULL) goto noshape; @@ -1095,7 +1095,7 @@ return pcb_false; } -PCB_INLINE pcb_bool_t pcb_isc_pstk_poly(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_poly_t *poly) +RND_INLINE pcb_bool_t pcb_isc_pstk_poly(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_poly_t *poly) { pcb_pstk_shape_t *shape; pcb_pstk_proto_t *proto; @@ -1115,7 +1115,7 @@ } -PCB_INLINE pcb_bool_t pstk_shape_isc_circ_poly(const pcb_find_t *ctx, pcb_pstk_t *p, pcb_pstk_shape_t *sp, pcb_pstk_t *c, pcb_pstk_shape_t *sc) +RND_INLINE pcb_bool_t pstk_shape_isc_circ_poly(const pcb_find_t *ctx, pcb_pstk_t *p, pcb_pstk_shape_t *sp, pcb_pstk_t *c, pcb_pstk_shape_t *sc) { rnd_coord_t px = sc->data.circ.x + c->x - p->x; rnd_coord_t py = sc->data.circ.y + c->y - p->y; @@ -1122,7 +1122,7 @@ return pcb_isc_line_polyline(ctx, sp->data.poly.pa->contours, px, py, px, py, sc->data.circ.dia); } -PCB_INLINE pcb_bool_t pstk_shape_isc_circ_line(const pcb_find_t *ctx, pcb_pstk_t *l, pcb_pstk_shape_t *sl, pcb_pstk_t *c, pcb_pstk_shape_t *sc) +RND_INLINE pcb_bool_t pstk_shape_isc_circ_line(const pcb_find_t *ctx, pcb_pstk_t *l, pcb_pstk_shape_t *sl, pcb_pstk_t *c, pcb_pstk_shape_t *sc) { pcb_any_line_t tmp; tmp.Point1.X = sl->data.line.x1 + l->x; @@ -1134,7 +1134,7 @@ return pcb_is_point_in_line(sc->data.circ.x + c->x, sc->data.circ.y + c->y, sc->data.circ.dia/2, &tmp); } -PCB_INLINE pcb_bool_t pcb_pstk_shape_intersect(const pcb_find_t *ctx, pcb_pstk_t *ps1, pcb_pstk_shape_t *shape1, pcb_pstk_t *ps2, pcb_pstk_shape_t *shape2) +RND_INLINE pcb_bool_t pcb_pstk_shape_intersect(const pcb_find_t *ctx, pcb_pstk_t *ps1, pcb_pstk_shape_t *shape1, pcb_pstk_t *ps2, pcb_pstk_shape_t *shape2) { if ((shape1->shape == PCB_PSSH_POLY) && (shape1->data.poly.pa == NULL)) pcb_pstk_shape_update_pa(&shape1->data.poly); @@ -1204,7 +1204,7 @@ return pcb_false; } -PCB_INLINE pcb_bool_t pcb_isc_pstk_pstk(const pcb_find_t *ctx, pcb_pstk_t *ps1, pcb_pstk_t *ps2) +RND_INLINE pcb_bool_t pcb_isc_pstk_pstk(const pcb_find_t *ctx, pcb_pstk_t *ps1, pcb_pstk_t *ps2) { pcb_layer_t *ly; pcb_pstk_proto_t *proto1, *proto2; @@ -1239,7 +1239,7 @@ } -PCB_INLINE pcb_bool_t pcb_isc_pstk_rat(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_rat_t *rat) +RND_INLINE pcb_bool_t pcb_isc_pstk_rat(const pcb_find_t *ctx, pcb_pstk_t *ps, pcb_rat_t *rat) { pcb_board_t *pcb = PCB; Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 30913) +++ trunk/src/layer.h (revision 30914) @@ -335,7 +335,7 @@ /* Return the real layer, resolving layer bindings. Returns NULL on error (e.g. binding loop) */ -PCB_INLINE pcb_layer_t *pcb_layer_get_real(const pcb_layer_t *layer) +RND_INLINE pcb_layer_t *pcb_layer_get_real(const pcb_layer_t *layer) { int rec = 0; Index: trunk/src/layer_it.h =================================================================== --- trunk/src/layer_it.h (revision 30913) +++ trunk/src/layer_it.h (revision 30914) @@ -35,11 +35,11 @@ typedef struct pcb_layer_it_s pcb_layer_it_t; /* Start an iteration matching exact flags or any of the flags; returns -1 if over */ -PCB_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask); -PCB_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask); +RND_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask); +RND_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask); /* next iteration; returns -1 if over */ -PCB_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it); +RND_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it); /*************** inline implementation *************************/ @@ -52,7 +52,7 @@ unsigned int global:1; }; -PCB_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it) +RND_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it) { if (it->global) { /* over all layers, random order, without any checks - go the cheap way, bypassing groups */ @@ -87,7 +87,7 @@ } } -PCB_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask) +RND_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask) { it->stack = stack; it->mask = exact_mask; @@ -98,7 +98,7 @@ return pcb_layer_next(it); } -PCB_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask) +RND_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask) { it->stack = stack; it->mask = any_mask; @@ -109,7 +109,7 @@ return pcb_layer_next(it); } -PCB_INLINE pcb_layer_id_t pcb_layer_first_all(pcb_layer_stack_t *stack, pcb_layer_it_t *it) +RND_INLINE pcb_layer_id_t pcb_layer_first_all(pcb_layer_stack_t *stack, pcb_layer_it_t *it) { it->stack = stack; it->lidx = 0; Index: trunk/src/librnd/config.h.in =================================================================== --- trunk/src/librnd/config.h.in (revision 30913) +++ trunk/src/librnd/config.h.in (revision 30914) @@ -35,10 +35,10 @@ print_ternary ?cc/func_attr/unused/presents {#define PCB_FUNC_UNUSED __attribute__((unused))} {#define PCB_FUNC_UNUSED} print {\n\n/* inline, as detected ("inline" or empty) */\n} -print_ternary ?cc/inline {#define PCB_INLINE_DETECTED inline} {#define PCB_INLINE_DETECTED /* no inline */} +print_ternary ?cc/inline {#define RND_INLINE_DETECTED inline} {#define RND_INLINE_DETECTED /* no inline */} print {\n\n/* final, combined keywords and attributes for an inline function */\n} -print {#define PCB_INLINE static PCB_INLINE_DETECTED PCB_FUNC_UNUSED\n\n} +print {#define RND_INLINE static RND_INLINE_DETECTED PCB_FUNC_UNUSED\n\n} print {\n\n/* Wether setenv() works */\n} print_ternary ?libs/env/setenv/presents {#define PCB_HAVE_SETENV 1} {/* #undef PCB_HAVE_SETENV */} @@ -195,7 +195,7 @@ @?/local/pcb/include_stdint@ /* Coordinate type and properties, as detected by scconfig */ -typedef @/local/pcb/coord_type@ pcb_coord_t; +typedef @/local/pcb/coord_type@ rnd_coord_t; #define COORD_MAX @/local/pcb/coord_max@ #define coord_abs pcb_coord_abs Index: trunk/src/librnd/core/actions.h =================================================================== --- trunk/src/librnd/core/actions.h (revision 30913) +++ trunk/src/librnd/core/actions.h (revision 30914) @@ -146,13 +146,13 @@ fgw_func_t *rnd_act_lookup(const char *aname); char *rnd_make_action_name(char *out, const char *inp, int inp_len); -PCB_INLINE char *rnd_aname(char *out, const char *inp) +RND_INLINE char *rnd_aname(char *out, const char *inp) { return rnd_make_action_name(out, inp, strlen(inp)); } /* Return 0 on success after an action call */ -PCB_INLINE int rnd_act_result(fgw_arg_t *res, fgw_error_t ret) +RND_INLINE int rnd_act_result(fgw_arg_t *res, fgw_error_t ret) { if (ret != 0) return -1; Index: trunk/src/librnd/core/box.h =================================================================== --- trunk/src/librnd/core/box.h (revision 30913) +++ trunk/src/librnd/core/box.h (revision 30914) @@ -127,27 +127,27 @@ /* note that boxes are closed on top and left and open on bottom and right. this means that top-left corner is in box, *but bottom-right corner is not*. */ -PCB_INLINE rnd_bool rnd_point_in_box(const rnd_box_t * box, rnd_coord_t X, rnd_coord_t Y) +RND_INLINE rnd_bool rnd_point_in_box(const rnd_box_t * box, rnd_coord_t X, rnd_coord_t Y) { return (X >= box->X1) && (Y >= box->Y1) && (X < box->X2) && (Y < box->Y2); } -PCB_INLINE rnd_bool rnd_point_in_closed_box(const rnd_box_t * box, rnd_coord_t X, rnd_coord_t Y) +RND_INLINE rnd_bool rnd_point_in_closed_box(const rnd_box_t * box, rnd_coord_t X, rnd_coord_t Y) { return (X >= box->X1) && (Y >= box->Y1) && (X <= box->X2) && (Y <= box->Y2); } -PCB_INLINE rnd_bool rnd_box_is_good(const rnd_box_t * b) +RND_INLINE rnd_bool rnd_box_is_good(const rnd_box_t * b) { return (b->X1 < b->X2) && (b->Y1 < b->Y2); } -PCB_INLINE rnd_bool rnd_box_intersect(const rnd_box_t * a, const rnd_box_t * b) +RND_INLINE rnd_bool rnd_box_intersect(const rnd_box_t * a, const rnd_box_t * b) { return (a->X1 < b->X2) && (b->X1 < a->X2) && (a->Y1 < b->Y2) && (b->Y1 < a->Y2); } -PCB_INLINE rnd_cheap_point_t rnd_closest_cheap_point_in_box(const rnd_cheap_point_t * from, const rnd_box_t * box) +RND_INLINE rnd_cheap_point_t rnd_closest_cheap_point_in_box(const rnd_cheap_point_t * from, const rnd_box_t * box) { rnd_cheap_point_t r; assert(box->X1 < box->X2 && box->Y1 < box->Y2); @@ -157,12 +157,12 @@ return r; } -PCB_INLINE rnd_bool rnd_box_in_box(const rnd_box_t * outer, const rnd_box_t * inner) +RND_INLINE rnd_bool rnd_box_in_box(const rnd_box_t * outer, const rnd_box_t * inner) { return (outer->X1 <= inner->X1) && (inner->X2 <= outer->X2) && (outer->Y1 <= inner->Y1) && (inner->Y2 <= outer->Y2); } -PCB_INLINE rnd_box_t rnd_clip_box(const rnd_box_t * box, const rnd_box_t * clipbox) +RND_INLINE rnd_box_t rnd_clip_box(const rnd_box_t * box, const rnd_box_t * clipbox) { rnd_box_t r; assert(rnd_box_intersect(box, clipbox)); @@ -174,7 +174,7 @@ return r; } -PCB_INLINE rnd_box_t rnd_shrink_box(const rnd_box_t * box, rnd_coord_t amount) +RND_INLINE rnd_box_t rnd_shrink_box(const rnd_box_t * box, rnd_coord_t amount) { rnd_box_t r = *box; r.X1 += amount; @@ -184,13 +184,13 @@ return r; } -PCB_INLINE rnd_box_t rnd_bloat_box(const rnd_box_t * box, rnd_coord_t amount) +RND_INLINE rnd_box_t rnd_bloat_box(const rnd_box_t * box, rnd_coord_t amount) { return rnd_shrink_box(box, -amount); } /* construct a minimum box that touches the input box at the center */ -PCB_INLINE rnd_box_t rnd_box_center(const rnd_box_t * box) +RND_INLINE rnd_box_t rnd_box_center(const rnd_box_t * box) { rnd_box_t r; r.X1 = box->X1 + (box->X2 - box->X1) / 2; @@ -201,7 +201,7 @@ } /* construct a minimum box that touches the input box at the corner */ -PCB_INLINE rnd_box_t rnd_box_corner(const rnd_box_t * box) +RND_INLINE rnd_box_t rnd_box_corner(const rnd_box_t * box) { rnd_box_t r; r.X1 = box->X1; @@ -212,7 +212,7 @@ } /* construct a box that holds a single point */ -PCB_INLINE rnd_box_t rnd_point_box(rnd_coord_t X, rnd_coord_t Y) +RND_INLINE rnd_box_t rnd_point_box(rnd_coord_t X, rnd_coord_t Y) { rnd_box_t r; r.X1 = X; @@ -223,7 +223,7 @@ } /* close a bounding box by pushing its upper right corner */ -PCB_INLINE void rnd_close_box(rnd_box_t * r) +RND_INLINE void rnd_close_box(rnd_box_t * r) { r->X2++; r->Y2++; @@ -232,7 +232,7 @@ /* return the square of the minimum distance from a point to some point inside a box. The box is half-closed! That is, the top-left corner is considered in the box, but the bottom-right corner is not. */ -PCB_INLINE double rnd_dist2_to_box(const rnd_cheap_point_t * p, const rnd_box_t * b) +RND_INLINE double rnd_dist2_to_box(const rnd_cheap_point_t * p, const rnd_box_t * b) { rnd_cheap_point_t r = rnd_closest_cheap_point_in_box(p, b); return rnd_distance(r.X, r.Y, p->X, p->Y); @@ -240,7 +240,7 @@ /* Modify dst to include src */ -PCB_INLINE void rnd_box_bump_box(rnd_box_t *dst, const rnd_box_t *src) +RND_INLINE void rnd_box_bump_box(rnd_box_t *dst, const rnd_box_t *src) { if (src->X1 < dst->X1) dst->X1 = src->X1; if (src->Y1 < dst->Y1) dst->Y1 = src->Y1; @@ -249,7 +249,7 @@ } /* Modify dst to include src */ -PCB_INLINE void rnd_box_bump_point(rnd_box_t *dst, rnd_coord_t x, rnd_coord_t y) +RND_INLINE void rnd_box_bump_point(rnd_box_t *dst, rnd_coord_t x, rnd_coord_t y) { if (x < dst->X1) dst->X1 = x; if (y < dst->Y1) dst->Y1 = y; Index: trunk/src/librnd/core/color_cache.h =================================================================== --- trunk/src/librnd/core/color_cache.h (revision 30913) +++ trunk/src/librnd/core/color_cache.h (revision 30914) @@ -43,7 +43,7 @@ void *user_data; /* the caller can set this up after pcb_clrcache_init and use it in hidfree() */ }; -PCB_INLINE void pcb_clrcache_init(pcb_clrcache_t *cache, int hidsize, pcb_clrcache_free_t hidfree) +RND_INLINE void pcb_clrcache_init(pcb_clrcache_t *cache, int hidsize, pcb_clrcache_free_t hidfree) { htip_init(&cache->ht, longhash, longkeyeq); cache->hidsize = hidsize; @@ -51,7 +51,7 @@ cache->user_data = NULL; } -PCB_INLINE void pcb_clrcache_del(pcb_clrcache_t *cache, const pcb_color_t *color) +RND_INLINE void pcb_clrcache_del(pcb_clrcache_t *cache, const pcb_color_t *color) { void *old = htip_get(&cache->ht, color->packed); if (old == NULL) @@ -61,7 +61,7 @@ free(old); } -PCB_INLINE void *pcb_clrcache_get(pcb_clrcache_t *cache, const pcb_color_t *color, int alloc) +RND_INLINE void *pcb_clrcache_get(pcb_clrcache_t *cache, const pcb_color_t *color, int alloc) { void *clr = htip_get(&cache->ht, color->packed); if (clr != NULL) @@ -75,7 +75,7 @@ return clr; } -PCB_INLINE void pcb_clrcache_uninit(pcb_clrcache_t *cache) +RND_INLINE void pcb_clrcache_uninit(pcb_clrcache_t *cache) { htip_entry_t *e; Index: trunk/src/librnd/core/hid_dad_tree.h =================================================================== --- trunk/src/librnd/core/hid_dad_tree.h (revision 30913) +++ trunk/src/librnd/core/hid_dad_tree.h (revision 30914) @@ -48,7 +48,7 @@ pcb_hid_row_t *pcb_dad_tree_mkdirp(pcb_hid_tree_t *tree, char *path, char **cells); /* Internal: Allocate a new row and load the cells (but do not insert it anywhere) */ -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_new_row(char **cols) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_new_row(char **cols) { int num_cols; pcb_hid_row_t *nrow; @@ -63,7 +63,7 @@ return nrow; } -PCB_INLINE void pcb_dad_tree_free_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE void pcb_dad_tree_free_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) { int do_free_path = 0; /* do this before the user callback just in case row->path == row->cell[0] @@ -83,7 +83,7 @@ } -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_parent_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_parent_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) { char *ptr = (char *)row->link.parent; if ((ptr == NULL) || ((gdl_list_t *)ptr == &tree->rows)) @@ -94,18 +94,18 @@ return (pcb_hid_row_t *)ptr; } -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_prev_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_prev_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) { return row->link.prev; } -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_next_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_next_row(pcb_hid_tree_t *tree, pcb_hid_row_t *row) { return row->link.next; } /* recursively build a full path of a tree node in path */ -PCB_INLINE void pcb_dad_tree_build_path(pcb_hid_tree_t *tree, gds_t *path, pcb_hid_row_t *row) +RND_INLINE void pcb_dad_tree_build_path(pcb_hid_tree_t *tree, gds_t *path, pcb_hid_row_t *row) { pcb_hid_row_t *par = pcb_dad_tree_parent_row(tree, row); if (par != NULL) @@ -116,7 +116,7 @@ } /* calculate path of a row and insert it in the tree hash */ -PCB_INLINE void pcb_dad_tree_set_hash(pcb_hid_attribute_t *attr, pcb_hid_row_t *row) +RND_INLINE void pcb_dad_tree_set_hash(pcb_hid_attribute_t *attr, pcb_hid_row_t *row) { pcb_hid_tree_t *tree = attr->wdata; if (attr->pcb_hatt_flags & PCB_HATF_TREE_COL) { @@ -132,7 +132,7 @@ /* allocate a new row and append it after aft; if aft is NULL, the new row is appended at the end of the list of entries in the root (== at the bottom of the list) */ -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_append(pcb_hid_attribute_t *attr, pcb_hid_row_t *aft, char **cols) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_append(pcb_hid_attribute_t *attr, pcb_hid_row_t *aft, char **cols) { pcb_hid_tree_t *tree = attr->wdata; pcb_hid_row_t *nrow = pcb_dad_tree_new_row(cols); @@ -156,7 +156,7 @@ /* allocate a new row and inert it before bfr; if bfr is NULL, the new row is inserted at the beginning of the list of entries in the root (== at the top of the list) */ -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_insert(pcb_hid_attribute_t *attr, pcb_hid_row_t *bfr, char **cols) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_insert(pcb_hid_attribute_t *attr, pcb_hid_row_t *bfr, char **cols) { pcb_hid_tree_t *tree = attr->wdata; pcb_hid_row_t *nrow = pcb_dad_tree_new_row(cols); @@ -180,7 +180,7 @@ /* allocate a new row and append it under prn; if aft is NULL, the new row is appended at the end of the list of entries in the root (== at the bottom of the list) */ -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_append_under(pcb_hid_attribute_t *attr, pcb_hid_row_t *prn, char **cols) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_append_under(pcb_hid_attribute_t *attr, pcb_hid_row_t *prn, char **cols) { pcb_hid_tree_t *tree = attr->wdata; pcb_hid_row_t *nrow = pcb_dad_tree_new_row(cols); @@ -200,7 +200,7 @@ return nrow; } -PCB_INLINE int pcb_dad_tree_remove(pcb_hid_attribute_t *attr, pcb_hid_row_t *row) +RND_INLINE int pcb_dad_tree_remove(pcb_hid_attribute_t *attr, pcb_hid_row_t *row) { pcb_hid_tree_t *tree = attr->wdata; pcb_hid_row_t *r, *rn, *par = pcb_dad_tree_parent_row(tree, row); @@ -227,7 +227,7 @@ return res; } -PCB_INLINE void pcb_dad_tree_clear(pcb_hid_tree_t *tree) +RND_INLINE void pcb_dad_tree_clear(pcb_hid_tree_t *tree) { pcb_hid_row_t *r; for(r = gdl_first(&tree->rows); r != NULL; r = gdl_first(&tree->rows)) @@ -234,7 +234,7 @@ pcb_dad_tree_remove(tree->attrib, r); } -PCB_INLINE pcb_hid_row_t *pcb_dad_tree_get_selected(pcb_hid_attribute_t *attr) +RND_INLINE pcb_hid_row_t *pcb_dad_tree_get_selected(pcb_hid_attribute_t *attr) { pcb_hid_tree_t *tree = attr->wdata; @@ -246,7 +246,7 @@ return tree->hid_get_selected_cb(tree->attrib, tree->hid_wdata); } -PCB_INLINE void pcb_dad_tree_update_hide(pcb_hid_attribute_t *attr) +RND_INLINE void pcb_dad_tree_update_hide(pcb_hid_attribute_t *attr) { pcb_hid_tree_t *tree = attr->wdata; @@ -256,7 +256,7 @@ tree->hid_update_hide_cb(tree->attrib, tree->hid_wdata); } -PCB_INLINE int pcb_dad_tree_modify_cell(pcb_hid_attribute_t *attr, pcb_hid_row_t *row, int col, char *new_val) +RND_INLINE int pcb_dad_tree_modify_cell(pcb_hid_attribute_t *attr, pcb_hid_row_t *row, int col, char *new_val) { pcb_hid_tree_t *tree = attr->wdata; @@ -282,7 +282,7 @@ return 0; } -PCB_INLINE void pcb_dad_tree_jumpto(pcb_hid_attribute_t *attr, pcb_hid_row_t *row) +RND_INLINE void pcb_dad_tree_jumpto(pcb_hid_attribute_t *attr, pcb_hid_row_t *row) { pcb_hid_tree_t *tree = attr->wdata; @@ -292,7 +292,7 @@ tree->hid_jumpto_cb(tree->attrib, tree->hid_wdata, row); } -PCB_INLINE void pcb_dad_tree_expcoll_(pcb_hid_tree_t *tree, pcb_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) +RND_INLINE void pcb_dad_tree_expcoll_(pcb_hid_tree_t *tree, pcb_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) { if (recursive) { pcb_hid_row_t *r; @@ -303,7 +303,7 @@ tree->hid_expcoll_cb(tree->attrib, tree->hid_wdata, row, expanded); } -PCB_INLINE void pcb_dad_tree_expcoll(pcb_hid_attribute_t *attr, pcb_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) +RND_INLINE void pcb_dad_tree_expcoll(pcb_hid_attribute_t *attr, pcb_hid_row_t *row, rnd_bool expanded, rnd_bool recursive) { pcb_hid_tree_t *tree = attr->wdata; Index: trunk/src/librnd/core/hid_inlines.h =================================================================== --- trunk/src/librnd/core/hid_inlines.h (revision 30913) +++ trunk/src/librnd/core/hid_inlines.h (revision 30914) @@ -30,7 +30,7 @@ #include #include -PCB_INLINE pcb_hid_gc_t pcb_hid_make_gc(void) +RND_INLINE pcb_hid_gc_t pcb_hid_make_gc(void) { pcb_hid_gc_t res; pcb_core_gc_t *hc; @@ -44,12 +44,12 @@ return res; } -PCB_INLINE void pcb_hid_destroy_gc(pcb_hid_gc_t gc) +RND_INLINE void pcb_hid_destroy_gc(pcb_hid_gc_t gc) { pcb_render->destroy_gc(gc); } -PCB_INLINE void pcb_hid_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style) +RND_INLINE void pcb_hid_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style) { pcb_core_gc_t *hc = (pcb_core_gc_t *)gc; if (hc->cap != style) { @@ -58,7 +58,7 @@ } } -PCB_INLINE void pcb_hid_set_line_width(pcb_hid_gc_t gc, rnd_coord_t width) +RND_INLINE void pcb_hid_set_line_width(pcb_hid_gc_t gc, rnd_coord_t width) { pcb_core_gc_t *hc = (pcb_core_gc_t *)gc; if (hc->width != width) { @@ -67,7 +67,7 @@ } } -PCB_INLINE void pcb_hid_set_draw_xor(pcb_hid_gc_t gc, int xor) +RND_INLINE void pcb_hid_set_draw_xor(pcb_hid_gc_t gc, int xor) { pcb_core_gc_t *hc = (pcb_core_gc_t *)gc; if (hc->xor != xor) { @@ -76,7 +76,7 @@ } } -PCB_INLINE void pcb_hid_set_draw_faded(pcb_hid_gc_t gc, int faded) +RND_INLINE void pcb_hid_set_draw_faded(pcb_hid_gc_t gc, int faded) { pcb_core_gc_t *hc = (pcb_core_gc_t *)gc; if (hc->faded != faded) { @@ -85,7 +85,7 @@ } } -PCB_INLINE const char *pcb_hid_command_entry(const char *ovr, int *cursor) +RND_INLINE const char *pcb_hid_command_entry(const char *ovr, int *cursor) { if ((pcb_gui == NULL) || (pcb_gui->command_entry == NULL)) { if (cursor != NULL) Index: trunk/src/librnd/core/rotate.h =================================================================== --- trunk/src/librnd/core/rotate.h (revision 30913) +++ trunk/src/librnd/core/rotate.h (revision 30914) @@ -51,7 +51,7 @@ } \ } while(0) -PCB_INLINE void pcb_rotate(rnd_coord_t * x, rnd_coord_t * y, rnd_coord_t cx, rnd_coord_t cy, double cosa, double sina) +RND_INLINE void pcb_rotate(rnd_coord_t * x, rnd_coord_t * y, rnd_coord_t cx, rnd_coord_t cy, double cosa, double sina) { double nx, ny; rnd_coord_t px = *x - cx; Index: trunk/src/librnd/core/unit.h =================================================================== --- trunk/src/librnd/core/unit.h (revision 30913) +++ trunk/src/librnd/core/unit.h (revision 30914) @@ -145,7 +145,7 @@ #define PCB_SWAP_ANGLE(a) (-(a)) #define PCB_SWAP_DELTA(d) (-(d)) -PCB_INLINE rnd_coord_t pcb_coord_abs(rnd_coord_t c) +RND_INLINE rnd_coord_t pcb_coord_abs(rnd_coord_t c) { if (c < 0) return -c; return c; Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30913) +++ trunk/src/librnd/pcb_compat.h (revision 30914) @@ -120,3 +120,4 @@ #define pcb_cheap_point_t rnd_cheap_point_t #define pcb_distance rnd_distance #define pcb_cardinal_t rnd_cardinal_t +#define PCB_INLINE RND_INLINE Index: trunk/src/librnd/poly/offset.c =================================================================== --- trunk/src/librnd/poly/offset.c (revision 30913) +++ trunk/src/librnd/poly/offset.c (revision 30914) @@ -255,7 +255,7 @@ } /* Modify v, pulling it back toward vp so that the distance to line ldx;ldy is increased by tune */ -PCB_INLINE int pull_back(pcb_vnode_t *v, const pcb_vnode_t *vp, double tune, double ldx, double ldy, double prjx, double prjy, int inside) +RND_INLINE int pull_back(pcb_vnode_t *v, const pcb_vnode_t *vp, double tune, double ldx, double ldy, double prjx, double prjy, int inside) { rnd_coord_t ox, oy; double c, vx, vy, vlen, prx, pry, prlen; Index: trunk/src/librnd/poly/polyarea.c =================================================================== --- trunk/src/librnd/poly/polyarea.c (revision 30913) +++ trunk/src/librnd/poly/polyarea.c (revision 30914) @@ -114,7 +114,7 @@ #ifndef NDEBUG #include -PCB_INLINE void DEBUGP(const char *fmt, ...) +RND_INLINE void DEBUGP(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -122,7 +122,7 @@ va_end(ap); } #else -PCB_INLINE void DEBUGP(const char *fmt, ...) { } +RND_INLINE void DEBUGP(const char *fmt, ...) { } #endif /* ///////////////////////////////////////////////////////////////////////////// * / @@ -2423,7 +2423,7 @@ } } -PCB_INLINE void pcb_poly_vertex_include_force_(pcb_vnode_t *after, pcb_vnode_t *node) +RND_INLINE void pcb_poly_vertex_include_force_(pcb_vnode_t *after, pcb_vnode_t *node) { assert(after != NULL); assert(node != NULL); @@ -2918,7 +2918,7 @@ #endif -PCB_INLINE rnd_bool PA_CHK_ERROR(pa_chk_res_t *res, const char *fmt, ...) +RND_INLINE rnd_bool PA_CHK_ERROR(pa_chk_res_t *res, const char *fmt, ...) { #ifndef NDEBUG va_list ap; Index: trunk/src/librnd/poly/polyarea.h =================================================================== --- trunk/src/librnd/poly/polyarea.h (revision 30913) +++ trunk/src/librnd/poly/polyarea.h (revision 30914) @@ -170,7 +170,7 @@ double pcb_round(double x); /* from math_helper.h */ /* Calculate an endpoint of an arc and return the result in *x;*y */ -PCB_INLINE void pcb_arc_get_endpt(rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, pcb_angle_t astart, pcb_angle_t adelta, int which, rnd_coord_t *x, rnd_coord_t *y) +RND_INLINE void pcb_arc_get_endpt(rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, pcb_angle_t astart, pcb_angle_t adelta, int which, rnd_coord_t *x, rnd_coord_t *y) { if (which == 0) { *x = pcb_round((double)cx - (double)width * cos(astart * (M_PI/180.0))); Index: trunk/src/netlist.h =================================================================== --- trunk/src/netlist.h (revision 30913) +++ trunk/src/netlist.h (revision 30914) @@ -172,7 +172,7 @@ htsp_entry_t *next; } pcb_net_it_t; -PCB_INLINE pcb_net_t *pcb_net_next(pcb_net_it_t *it) +RND_INLINE pcb_net_t *pcb_net_next(pcb_net_it_t *it) { pcb_net_t *res; if (it->next == NULL) @@ -182,7 +182,7 @@ return res; } -PCB_INLINE pcb_net_t *pcb_net_first(pcb_net_it_t *it, pcb_netlist_t *nl) +RND_INLINE pcb_net_t *pcb_net_first(pcb_net_it_t *it, pcb_netlist_t *nl) { it->nl = nl; it->next = htsp_first(nl); Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 30913) +++ trunk/src/obj_common.h (revision 30914) @@ -283,7 +283,7 @@ #define pcb_size_class(a) ((a) < 32 ? 16 : ((a) < 64 ? 32 : ((a) < 128 ? 64 : ((a) < 256 ? 128 : ((a) < 512 ? 256 : ((a) < 1024 ? 512 : 1024 )))))) /* Return an object-instance-unique integer value */ -PCB_INLINE size_t pcb_obj_iid(pcb_any_obj_t *obj) +RND_INLINE size_t pcb_obj_iid(pcb_any_obj_t *obj) { return (size_t)obj / pcb_size_class(sizeof(pcb_any_obj_t)); } Index: trunk/src/obj_hash.h =================================================================== --- trunk/src/obj_hash.h (revision 30913) +++ trunk/src/obj_hash.h (revision 30914) @@ -29,7 +29,7 @@ #include /* compare two strings and return 0 if they are equal. NULL == NULL means equal. */ -PCB_INLINE int pcb_neqs(const char *s1, const char *s2) +RND_INLINE int pcb_neqs(const char *s1, const char *s2) { if ((s1 == NULL) && (s2 == NULL)) return 0; if ((s1 == NULL) || (s2 == NULL)) return 1; @@ -36,7 +36,7 @@ return strcmp(s1, s2) != 0; } -PCB_INLINE unsigned pcb_hash_coord(rnd_coord_t c) +RND_INLINE unsigned pcb_hash_coord(rnd_coord_t c) { return murmurhash(&(c), sizeof(rnd_coord_t)); } @@ -43,12 +43,12 @@ /* cheat: round with a tolerance of a few nanometers to overcome the usual +-1 nanometer rounding error */ -PCB_INLINE rnd_coord_t pcb_round_tol(double v, int tol) +RND_INLINE rnd_coord_t pcb_round_tol(double v, int tol) { return pcb_round(v/(double)tol)*tol; } -PCB_INLINE void pcb_hash_tr_coords(const pcb_host_trans_t *tr, rnd_coord_t *dstx, rnd_coord_t *dsty, rnd_coord_t srcx, rnd_coord_t srcy) +RND_INLINE void pcb_hash_tr_coords(const pcb_host_trans_t *tr, rnd_coord_t *dstx, rnd_coord_t *dsty, rnd_coord_t srcx, rnd_coord_t srcy) { rnd_coord_t px, py; @@ -71,7 +71,7 @@ } -PCB_INLINE unsigned pcb_hash_angle(const pcb_host_trans_t *tr, pcb_angle_t ang) +RND_INLINE unsigned pcb_hash_angle(const pcb_host_trans_t *tr, pcb_angle_t ang) { long l; ang = fmod(ang + tr->rot, 360.0); @@ -86,7 +86,7 @@ #define pcb_field_neq(s1, s2, f) ((s1)->f != (s2)->f) /* retruns if two sets of tr;x;y mismatches */ -PCB_INLINE rnd_bool pcb_neq_tr_coords(const pcb_host_trans_t *tr1, rnd_coord_t x1, rnd_coord_t y1, const pcb_host_trans_t *tr2, rnd_coord_t x2, rnd_coord_t y2) +RND_INLINE rnd_bool pcb_neq_tr_coords(const pcb_host_trans_t *tr1, rnd_coord_t x1, rnd_coord_t y1, const pcb_host_trans_t *tr2, rnd_coord_t x2, rnd_coord_t y2) { pcb_hash_tr_coords(tr1, &x1, &y1, x1, y1); pcb_hash_tr_coords(tr2, &x2, &y2, x2, y2); Index: trunk/src/obj_poly.h =================================================================== --- trunk/src/obj_poly.h (revision 30913) +++ trunk/src/obj_poly.h (revision 30914) @@ -129,7 +129,7 @@ } pcb_poly_it_t; /* Set the iterator to the first island of the polygon; returns NULL if no contour available */ -PCB_INLINE pcb_polyarea_t *pcb_poly_island_first(const pcb_poly_t *p, pcb_poly_it_t *it) +RND_INLINE pcb_polyarea_t *pcb_poly_island_first(const pcb_poly_t *p, pcb_poly_it_t *it) { it->p = p; it->pa = p->Clipped; @@ -139,7 +139,7 @@ } /* Set the iterator to the next island of the polygon; returns NULL if no more */ -PCB_INLINE pcb_polyarea_t *pcb_poly_island_next(pcb_poly_it_t *it) +RND_INLINE pcb_polyarea_t *pcb_poly_island_next(pcb_poly_it_t *it) { if (it->pa->f == it->p->Clipped) return NULL; @@ -150,7 +150,7 @@ } /* Set the iterator to trace the outer contour of the current island */ -PCB_INLINE pcb_pline_t *pcb_poly_contour(pcb_poly_it_t *it) +RND_INLINE pcb_pline_t *pcb_poly_contour(pcb_poly_it_t *it) { it->v = NULL; return it->cntr = it->pa->contours; @@ -157,7 +157,7 @@ } /* Set the iterator to trace the first hole of the current island; returns NULL if there are no holes */ -PCB_INLINE pcb_pline_t *pcb_poly_hole_first(pcb_poly_it_t *it) +RND_INLINE pcb_pline_t *pcb_poly_hole_first(pcb_poly_it_t *it) { it->v = NULL; return it->cntr = it->pa->contours->next; @@ -164,7 +164,7 @@ } /* Set the iterator to trace the next hole of the current island; returns NULL if there are were more holes */ -PCB_INLINE pcb_pline_t *pcb_poly_hole_next(pcb_poly_it_t *it) +RND_INLINE pcb_pline_t *pcb_poly_hole_next(pcb_poly_it_t *it) { it->v = NULL; return it->cntr = it->cntr->next; @@ -172,7 +172,7 @@ /* Set the iterator to the first point of the last selected contour or hole; read the coords into x,y; returns 1 on success, 0 if there are no points */ -PCB_INLINE int pcb_poly_vect_first(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) +RND_INLINE int pcb_poly_vect_first(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) { it->v = it->cntr->head->next; if (it->v == NULL) @@ -185,7 +185,7 @@ /* Set the iterator to the next point of the last selected contour or hole; read the coords into x,y; returns 1 on success, 0 if there are were more points */ -PCB_INLINE int pcb_poly_vect_next(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) +RND_INLINE int pcb_poly_vect_next(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) { it->v = it->v->next; if (it->v == it->cntr->head->next) @@ -196,7 +196,7 @@ } /* read the previous contour/hole coords into x,y, without bumping the iterator */ -PCB_INLINE void pcb_poly_vect_peek_prev(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) +RND_INLINE void pcb_poly_vect_peek_prev(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) { *x = it->v->prev->point[0]; *y = it->v->prev->point[1]; @@ -203,7 +203,7 @@ } /* read the next contour/hole coords into x,y, without bumping the iterator */ -PCB_INLINE void pcb_poly_vect_peek_next(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) +RND_INLINE void pcb_poly_vect_peek_next(pcb_poly_it_t *it, rnd_coord_t *x, rnd_coord_t *y) { *x = it->v->next->point[0]; *y = it->v->next->point[1]; @@ -210,7 +210,7 @@ } /* Set the iterator to a polyarea*/ -PCB_INLINE pcb_polyarea_t *pcb_poly_iterate_polyarea(pcb_polyarea_t *pa, pcb_poly_it_t *it) +RND_INLINE pcb_polyarea_t *pcb_poly_iterate_polyarea(pcb_polyarea_t *pa, pcb_poly_it_t *it) { it->p = NULL; it->pa = pa; Index: trunk/src/obj_pstk_inlines.h =================================================================== --- trunk/src/obj_pstk_inlines.h (revision 30913) +++ trunk/src/obj_pstk_inlines.h (revision 30914) @@ -42,7 +42,7 @@ } pcb_bb_type_t; /* Returns the ID of a proto within its parent's cache */ -PCB_INLINE rnd_cardinal_t pcb_pstk_get_proto_id(const pcb_pstk_proto_t *proto) +RND_INLINE rnd_cardinal_t pcb_pstk_get_proto_id(const pcb_pstk_proto_t *proto) { pcb_data_t *data = proto->parent; if ((proto >= data->ps_protos.array) && (proto < data->ps_protos.array + data->ps_protos.used)) @@ -52,7 +52,7 @@ } /* return the padstack prototype for a padstack reference - returns NULL if not found */ -PCB_INLINE pcb_pstk_proto_t *pcb_pstk_get_proto_(const pcb_data_t *data, rnd_cardinal_t proto) +RND_INLINE pcb_pstk_proto_t *pcb_pstk_get_proto_(const pcb_data_t *data, rnd_cardinal_t proto) { if (proto >= data->ps_protos.used) return NULL; @@ -62,7 +62,7 @@ } /* return the padstack prototype for a padstack reference - returns NULL if not found */ -PCB_INLINE pcb_pstk_proto_t *pcb_pstk_get_proto(const pcb_pstk_t *ps) +RND_INLINE pcb_pstk_proto_t *pcb_pstk_get_proto(const pcb_pstk_t *ps) { return pcb_pstk_get_proto_(ps->parent.data, ps->proto); } @@ -69,7 +69,7 @@ /* return the padstack transformed shape. Returns NULL if the proto or the tshape is not. */ -PCB_INLINE pcb_pstk_tshape_t *pcb_pstk_get_tshape_(const pcb_data_t *data, rnd_cardinal_t proto, int protoi) +RND_INLINE pcb_pstk_tshape_t *pcb_pstk_get_tshape_(const pcb_data_t *data, rnd_cardinal_t proto, int protoi) { pcb_pstk_proto_t *pr = pcb_pstk_get_proto_(data, proto); if (protoi < 0) @@ -82,7 +82,7 @@ } /* return the padstack prototype for a padstack reference - returns NULL if not found */ -PCB_INLINE pcb_pstk_tshape_t *pcb_pstk_get_tshape(pcb_pstk_t *ps) +RND_INLINE pcb_pstk_tshape_t *pcb_pstk_get_tshape(pcb_pstk_t *ps) { if (ps->protoi < 0) { /* need to update this */ pcb_pstk_proto_t *pr = pcb_pstk_get_proto_(ps->parent.data, ps->proto); @@ -94,7 +94,7 @@ } /* return the padstack *untransformed* prototype for a padstack reference - returns NULL if not found */ -PCB_INLINE pcb_pstk_tshape_t *pcb_pstk_get_untshape(pcb_pstk_t *ps) +RND_INLINE pcb_pstk_tshape_t *pcb_pstk_get_untshape(pcb_pstk_t *ps) { pcb_pstk_proto_t *pr = pcb_pstk_get_proto_(ps->parent.data, ps->proto); if (pr == NULL) @@ -104,7 +104,7 @@ /* return the type of drill and optionally fill in group IDs of drill ends ; if proto_out is not NULL, also load it with the proto */ -PCB_INLINE pcb_bb_type_t pcb_pstk_bbspan(pcb_board_t *pcb, const pcb_pstk_t *ps, pcb_layergrp_id_t *top, pcb_layergrp_id_t *bottom, pcb_pstk_proto_t **proto_out) +RND_INLINE pcb_bb_type_t pcb_pstk_bbspan(pcb_board_t *pcb, const pcb_pstk_t *ps, pcb_layergrp_id_t *top, pcb_layergrp_id_t *bottom, pcb_pstk_proto_t **proto_out) { pcb_bb_type_t res; int topi, boti; @@ -182,7 +182,7 @@ /* return whether a given padstack drills a given group (does not consider plating, only drill!) */ -PCB_INLINE pcb_bool_t pcb_pstk_bb_drills(pcb_board_t *pcb, const pcb_pstk_t *ps, pcb_layergrp_id_t grp, pcb_pstk_proto_t **proto_out) +RND_INLINE pcb_bool_t pcb_pstk_bb_drills(pcb_board_t *pcb, const pcb_pstk_t *ps, pcb_layergrp_id_t grp, pcb_pstk_proto_t **proto_out) { pcb_layergrp_id_t top, bot; pcb_bb_type_t res = pcb_pstk_bbspan(pcb, ps, &top, &bot, proto_out); @@ -197,7 +197,7 @@ /* returns the shape the padstack has on the given layer group; WARNING: does not respect the NOSHAPE thermal, should NOT be called directly; use pcb_pstk_shape_*() instead. */ -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape(pcb_pstk_t *ps, pcb_layer_type_t lyt, pcb_layer_combining_t comb) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape(pcb_pstk_t *ps, pcb_layer_type_t lyt, pcb_layer_combining_t comb) { int n; pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape(ps); @@ -216,7 +216,7 @@ Useful for GUI dialogs only, for presenting the prototype (not the actual ps transformed reality) WARNING: does not respect the NOSHAPE thermal, should NOT be called directly; use pcb_pstk_shape_*() instead. */ -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_notransform(pcb_pstk_t *ps, pcb_layer_type_t lyt, pcb_layer_combining_t comb) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape_notransform(pcb_pstk_t *ps, pcb_layer_type_t lyt, pcb_layer_combining_t comb) { int n; pcb_pstk_tshape_t *ts = pcb_pstk_get_untshape(ps); @@ -233,7 +233,7 @@ } /* If force is non-zero, return the shape even if a thermal says no-shape */ -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_at_(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer, int force) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape_at_(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer, int force) { unsigned int lyt = pcb_layer_flags_(layer); pcb_layer_combining_t comb = layer->comb; @@ -268,13 +268,13 @@ return pcb_pstk_shape(ps, lyt, comb); } -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_at(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape_at(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer) { return pcb_pstk_shape_at_(pcb, ps, layer, 0); } -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_gid(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layergrp_id_t gid, pcb_layer_combining_t comb, pcb_layergrp_t **grp_out) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape_gid(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layergrp_id_t gid, pcb_layer_combining_t comb, pcb_layergrp_t **grp_out) { pcb_layergrp_t *grp = pcb_get_layergrp(pcb, gid); @@ -309,7 +309,7 @@ } /* Returns the mech shape (slot) if it affects grp */ -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_mech_gid(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layergrp_id_t grp) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape_mech_gid(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layergrp_id_t grp) { pcb_pstk_tshape_t *ts; pcb_pstk_proto_t *proto; @@ -325,7 +325,7 @@ } /* Returns the mech shape (slot) if it affects layer */ -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_mech_at(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape_mech_at(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer) { layer = pcb_layer_get_real(layer); return pcb_pstk_shape_mech_gid(pcb, ps, layer->meta.real.grp); @@ -333,7 +333,7 @@ /* Returns a shape correspinding to the hole or the mech shape (slot) if it affects layer; hole shape is created in holetmp */ -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_mech_or_hole_at(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer, pcb_pstk_shape_t *holetmp) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_shape_mech_or_hole_at(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer, pcb_pstk_shape_t *holetmp) { pcb_pstk_tshape_t *ts; pcb_pstk_proto_t *proto; @@ -363,7 +363,7 @@ shape. The forbidden shape should be the shape that triggers the lookup. tmpshp should be a local temporary shape where the circular shape for a hole can be built. */ -PCB_INLINE pcb_pstk_shape_t *pcb_pstk_hshadow_shape(pcb_pstk_t *ps, pcb_pstk_shape_t *forbidden, pcb_pstk_shape_t *tmpshp) +RND_INLINE pcb_pstk_shape_t *pcb_pstk_hshadow_shape(pcb_pstk_t *ps, pcb_pstk_shape_t *forbidden, pcb_pstk_shape_t *tmpshp) { pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps); pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape(ps); Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 30913) +++ trunk/src/obj_subc.c (revision 30914) @@ -2216,7 +2216,7 @@ return &sc->data->Layer[n]; } -PCB_INLINE void pcb_subc_part_changed__(pcb_subc_t *sc, int force) +RND_INLINE void pcb_subc_part_changed__(pcb_subc_t *sc, int force) { /* can't do this incrementally: if a boundary object is smaller than before it has to make the subc bbox smaller too */ Index: trunk/src/obj_subc_parent.h =================================================================== --- trunk/src/obj_subc_parent.h (revision 30913) +++ trunk/src/obj_subc_parent.h (revision 30914) @@ -32,7 +32,7 @@ #include "layer.h" /* Returns the subc a global (on-data) object is part of (or NULL if not part of any subc) */ -PCB_INLINE pcb_subc_t *pcb_gobj_parent_subc(pcb_parenttype_t pt, const pcb_parent_t *p) +RND_INLINE pcb_subc_t *pcb_gobj_parent_subc(pcb_parenttype_t pt, const pcb_parent_t *p) { if (pt != PCB_PARENT_DATA) return NULL; @@ -46,7 +46,7 @@ } /* Returns the subc a layer object is part of (or NULL if not part of any subc) */ -PCB_INLINE pcb_subc_t *pcb_lobj_parent_subc(pcb_parenttype_t pt, const pcb_parent_t *p) +RND_INLINE pcb_subc_t *pcb_lobj_parent_subc(pcb_parenttype_t pt, const pcb_parent_t *p) { if (pt != PCB_PARENT_LAYER) return NULL; @@ -63,7 +63,7 @@ } /* Returns the subc an object is part of (or NULL if not part of any subc) */ -PCB_INLINE pcb_subc_t *pcb_obj_parent_subc(const pcb_any_obj_t *obj) +RND_INLINE pcb_subc_t *pcb_obj_parent_subc(const pcb_any_obj_t *obj) { switch(obj->type) { case PCB_OBJ_PSTK: @@ -84,7 +84,7 @@ return 0; } -PCB_INLINE pcb_bool_t pcb_obj_is_under(pcb_any_obj_t *obj, pcb_data_t *data) +RND_INLINE pcb_bool_t pcb_obj_is_under(pcb_any_obj_t *obj, pcb_data_t *data) { for(;;) { switch(obj->parent_type) { Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 30913) +++ trunk/src/obj_text.c (revision 30914) @@ -1106,7 +1106,7 @@ } -PCB_INLINE void cheap_text_line(pcb_hid_gc_t gc, pcb_xform_mx_t mx, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t xordx, rnd_coord_t xordy) +RND_INLINE void cheap_text_line(pcb_hid_gc_t gc, pcb_xform_mx_t mx, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t xordx, rnd_coord_t xordy) { rnd_coord_t tx1, ty1, tx2, ty2; @@ -1125,7 +1125,7 @@ /* Decreased level-of-detail: draw only a few lines for the whole text */ -PCB_INLINE int draw_text_cheap(pcb_font_t *font, pcb_xform_mx_t mx, const unsigned char *string, int scale, int xordraw, rnd_coord_t xordx, rnd_coord_t xordy, pcb_text_tiny_t tiny) +RND_INLINE int draw_text_cheap(pcb_font_t *font, pcb_xform_mx_t mx, const unsigned char *string, int scale, int xordraw, rnd_coord_t xordx, rnd_coord_t xordy, pcb_text_tiny_t tiny) { rnd_coord_t w, h = PCB_SCALE_TEXT(font->MaxHeight, scale); if (tiny == PCB_TXT_TINY_HIDE) { @@ -1167,7 +1167,7 @@ return 0; } -PCB_INLINE void pcb_text_draw_string_(pcb_draw_info_t *info, pcb_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, int scale, double rotdeg, int mirror, rnd_coord_t thickness, rnd_coord_t min_line_width, int xordraw, rnd_coord_t xordx, rnd_coord_t xordy, pcb_text_tiny_t tiny, pcb_draw_text_cb cb, void *cb_ctx) +RND_INLINE void pcb_text_draw_string_(pcb_draw_info_t *info, pcb_font_t *font, const unsigned char *string, rnd_coord_t x0, rnd_coord_t y0, int scale, double rotdeg, int mirror, rnd_coord_t thickness, rnd_coord_t min_line_width, int xordraw, rnd_coord_t xordx, rnd_coord_t xordy, pcb_text_tiny_t tiny, pcb_draw_text_cb cb, void *cb_ctx) { rnd_coord_t x = 0; rnd_cardinal_t n; Index: trunk/src_plugins/hid_lesstif/pxm_helper.h =================================================================== --- trunk/src_plugins/hid_lesstif/pxm_helper.h (revision 30913) +++ trunk/src_plugins/hid_lesstif/pxm_helper.h (revision 30914) @@ -34,7 +34,7 @@ #define _XmWidgetToAppContext(w) \ XtAppContext app = XtWidgetToApplicationContext(w) -PCB_INLINE void PxmConfigureObject(Widget wid, +RND_INLINE void PxmConfigureObject(Widget wid, #if NeedWidePrototypes int x, int y, int width, int height, int border_width) #else @@ -70,7 +70,7 @@ * are intersected by the region. * ************************************************************************/ -PCB_INLINE void PxmRedisplayGadgets(Widget w, register XEvent *event, Region region) +RND_INLINE void PxmRedisplayGadgets(Widget w, register XEvent *event, Region region) { CompositeWidget mw = (CompositeWidget) w; register int i; @@ -124,7 +124,7 @@ * this one that will deal with the Xt reply value cuisine. * ****************/ -PCB_INLINE XtGeometryResult PxmReplyToQueryGeometry(Widget widget, XtWidgetGeometry *intended, XtWidgetGeometry *desired) +RND_INLINE XtGeometryResult PxmReplyToQueryGeometry(Widget widget, XtWidgetGeometry *intended, XtWidgetGeometry *desired) { _XmWidgetToAppContext(widget); /* the caller should have set desired width and height */ @@ -159,7 +159,7 @@ * event corresponding to its entire area. * ************************************************************************/ -PCB_INLINE void PxmRedisplayWidget(Widget widget) +RND_INLINE void PxmRedisplayWidget(Widget widget) { XExposeEvent xev; Region region; Index: trunk/src_plugins/lib_hid_common/clip.h =================================================================== --- trunk/src_plugins/lib_hid_common/clip.h (revision 30913) +++ trunk/src_plugins/lib_hid_common/clip.h (revision 30914) @@ -35,7 +35,7 @@ /* Clip X,Y to the given bounding box, plus a margin. Returns pcb_true if there is something left to be drawn. */ -PCB_INLINE rnd_bool pcb_line_clip(double minx, double miny, double maxx, double maxy, double *x1, double *y1, double *x2, double *y2, double margin) +RND_INLINE rnd_bool pcb_line_clip(double minx, double miny, double maxx, double maxy, double *x1, double *y1, double *x2, double *y2, double margin) { double d, r; Index: trunk/src_plugins/lib_hid_common/dad_markup.h =================================================================== --- trunk/src_plugins/lib_hid_common/dad_markup.h (revision 30913) +++ trunk/src_plugins/lib_hid_common/dad_markup.h (revision 30914) @@ -35,7 +35,7 @@ } pcb_markup_state_t; -PCB_INLINE const char *pcb_markup_next(pcb_markup_state_t *st, const char **at_, long *len) +RND_INLINE const char *pcb_markup_next(pcb_markup_state_t *st, const char **at_, long *len) { const char *start, *at = *at_; Index: trunk/src_plugins/lib_hid_gl/draw_gl.c =================================================================== --- trunk/src_plugins/lib_hid_gl/draw_gl.c (revision 30913) +++ trunk/src_plugins/lib_hid_gl/draw_gl.c (revision 30914) @@ -305,7 +305,7 @@ alpha = a; } -PCB_INLINE void drawgl_add_triangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2, GLfloat x3, GLfloat y3) +RND_INLINE void drawgl_add_triangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2, GLfloat x3, GLfloat y3) { /* Debug Drawing primitive_buffer_add(GL_LINES,vertex_buffer.size,6); @@ -323,7 +323,7 @@ } -PCB_INLINE void drawgl_add_texture_quad( GLfloat x1, GLfloat y1, GLfloat u1, GLfloat v1, +RND_INLINE void drawgl_add_texture_quad( GLfloat x1, GLfloat y1, GLfloat u1, GLfloat v1, GLfloat x2, GLfloat y2, GLfloat u2, GLfloat v2, GLfloat x3, GLfloat y3, GLfloat u3, GLfloat v3, GLfloat x4, GLfloat y4, GLfloat u4, GLfloat v4, @@ -337,7 +337,7 @@ vertex_buffer_add_xyuv(x4, y4, u4, v4); } -PCB_INLINE void drawgl_add_line(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) +RND_INLINE void drawgl_add_line(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) { primitive_buffer_add(GL_LINES, vertex_buffer.size, 2, 0); vertex_buffer_reserve_extra(2); @@ -345,7 +345,7 @@ vertex_buffer_add(x2, y2); } -PCB_INLINE void drawgl_add_rectangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) +RND_INLINE void drawgl_add_rectangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) { primitive_buffer_add(GL_LINE_LOOP, vertex_buffer.size, 4, 0); vertex_buffer_reserve_extra(4); @@ -355,22 +355,22 @@ vertex_buffer_add(x1, y2); } -PCB_INLINE void drawgl_add_mask_create() +RND_INLINE void drawgl_add_mask_create() { primitive_buffer_add(PRIM_MASK_CREATE, 0, 0, 0); } -PCB_INLINE void drawgl_add_mask_destroy() +RND_INLINE void drawgl_add_mask_destroy() { primitive_buffer_add(PRIM_MASK_DESTROY, 0, 0, 0); } -PCB_INLINE void drawgl_add_mask_use() +RND_INLINE void drawgl_add_mask_use() { primitive_buffer_add(PRIM_MASK_USE, 0, 0, 0); } -PCB_INLINE void drawgl_direct_draw_rectangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) +RND_INLINE void drawgl_direct_draw_rectangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) { glBegin(GL_LINE_LOOP); glColor4f(red, green, blue, alpha); @@ -381,7 +381,7 @@ glEnd(); } -PCB_INLINE void drawgl_direct_draw_solid_rectangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) +RND_INLINE void drawgl_direct_draw_solid_rectangle(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) { glBegin(GL_TRIANGLES); glColor4f(red, green, blue, alpha); @@ -394,7 +394,7 @@ glEnd(); } -PCB_INLINE void drawgl_reserve_triangles(int count) +RND_INLINE void drawgl_reserve_triangles(int count) { vertex_buffer_reserve_extra(count * 3); } @@ -483,7 +483,7 @@ /* Draw all buffered primitives. The dirty index is ignored and will remain unchanged. * This function accepts stencil bits that can be used to mask the drawing. */ -PCB_INLINE void drawgl_draw_all(int stencil_bits) +RND_INLINE void drawgl_draw_all(int stencil_bits) { int index = primitive_buffer.size; primitive_t *prim; @@ -618,13 +618,13 @@ primitive_buffer_clear(); } -PCB_INLINE void drawgl_set_marker() +RND_INLINE void drawgl_set_marker() { vertex_buffer_set_marker(); primitive_buffer_set_marker(); } -PCB_INLINE void drawgl_rewind_to_marker() +RND_INLINE void drawgl_rewind_to_marker() { vertex_buffer_rewind(); primitive_buffer_rewind(); Index: trunk/src_plugins/millpath/toolpath.c =================================================================== --- trunk/src_plugins/millpath/toolpath.c (revision 30913) +++ trunk/src_plugins/millpath/toolpath.c (revision 30914) @@ -53,7 +53,7 @@ extern const char *pcb_millpath_cookie; -PCB_INLINE void sub_layer_line(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer, const pcb_line_t *line_in, int centerline) +RND_INLINE void sub_layer_line(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer, const pcb_line_t *line_in, int centerline) { pcb_line_t line_tmp; @@ -68,7 +68,7 @@ pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_LINE, &line_tmp); } -PCB_INLINE void sub_layer_arc(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer, const pcb_arc_t *arc_in, int centerline) +RND_INLINE void sub_layer_arc(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer, const pcb_arc_t *arc_in, int centerline) { pcb_arc_t arc_tmp; @@ -83,7 +83,7 @@ pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_ARC, &arc_tmp); } -PCB_INLINE void sub_layer_poly(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer, const pcb_poly_t *poly, int centerline) +RND_INLINE void sub_layer_poly(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer, const pcb_poly_t *poly, int centerline) { pcb_polyarea_t *f, *b, *ra; Index: trunk/src_plugins/mincut/pcb-mincut/graph.h =================================================================== --- trunk/src_plugins/mincut/pcb-mincut/graph.h (revision 30913) +++ trunk/src_plugins/mincut/pcb-mincut/graph.h (revision 30914) @@ -38,7 +38,7 @@ void gr_free(gr_t *g); -PCB_INLINE void gr_bound_chk(gr_t *g, int n1, int n2) +RND_INLINE void gr_bound_chk(gr_t *g, int n1, int n2) { assert((n1 >= 0) && (n1 < g->n)); assert((n2 >= 0) && (n2 < g->n)); @@ -45,13 +45,13 @@ } /* return number of edges between nodes n1 and n2 - without checks */ -PCB_INLINE int gr_get_(gr_t *g, int n1, int n2) +RND_INLINE int gr_get_(gr_t *g, int n1, int n2) { return g->adj[n1 * g->n + n2]; } /* return number of edges between nodes n1 and n2 - with checks */ -PCB_INLINE int gr_get(gr_t *g, int n1, int n2) +RND_INLINE int gr_get(gr_t *g, int n1, int n2) { gr_bound_chk(g, n1, n2); return gr_get_(g, n1, n2); @@ -58,7 +58,7 @@ } /* return old number of edges between nodes n1 and n2 and change it to newnum - no check*/ -PCB_INLINE int gr_set_(gr_t *g, int n1, int n2, int newnum) +RND_INLINE int gr_set_(gr_t *g, int n1, int n2, int newnum) { int old; old = g->adj[n1 * g->n + n2]; @@ -68,7 +68,7 @@ } /* return old number of edges between nodes n1 and n2 and increase it by newnum - no check*/ -PCB_INLINE int gr_add_(gr_t *g, int n1, int n2, int newnum) +RND_INLINE int gr_add_(gr_t *g, int n1, int n2, int newnum) { int old; old = g->adj[n1 * g->n + n2]; @@ -78,7 +78,7 @@ } /* return old number of edges between nodes n1 and n2 and change it to newnum - check*/ -PCB_INLINE int gr_set(gr_t *g, int n1, int n2, int newnum) +RND_INLINE int gr_set(gr_t *g, int n1, int n2, int newnum) { gr_bound_chk(g, n1, n2); return gr_set_(g, n1, n2, newnum); Index: trunk/src_plugins/query/net_int.c =================================================================== --- trunk/src_plugins/query/net_int.c (revision 30913) +++ trunk/src_plugins/query/net_int.c (revision 30914) @@ -133,7 +133,7 @@ } -PCB_INLINE pcb_any_obj_t *pcb_qry_parent_net_term_(pcb_qry_exec_t *ec, pcb_any_obj_t *from) +RND_INLINE pcb_any_obj_t *pcb_qry_parent_net_term_(pcb_qry_exec_t *ec, pcb_any_obj_t *from) { pcb_find_t fctx; parent_net_term_t ctx;