Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 4782) +++ trunk/src/find.h (revision 4783) @@ -38,10 +38,10 @@ FCT_RAT = 4, /* connected by a rat line */ FCT_ELEMENT = 8, /* pin/pad is part of an element whose pins/pads are being listed */ FCT_START = 16 /* starting object of a query */ -} found_conn_type_t; +} pcb_found_conn_type_t; typedef void (*find_callback_t) (int current_type, void *current_ptr, int from_type, void *from_ptr, - found_conn_type_t conn_type); + pcb_found_conn_type_t conn_type); /* if not NULL, this function is called whenever something is found Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 4782) +++ trunk/src/find_lookup.c (revision 4783) @@ -47,7 +47,7 @@ /* Connection lookup functions */ -static pcb_bool ADD_PV_TO_LIST(pcb_pin_t *Pin, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_PV_TO_LIST(pcb_pin_t *Pin, int from_type, void *from_ptr, pcb_found_conn_type_t type) { if (User) AddObjectToFlagUndoList(Pin->Element ? PCB_TYPE_PIN : PCB_TYPE_VIA, Pin->Element ? Pin->Element : Pin, Pin, Pin); @@ -64,7 +64,7 @@ return pcb_false; } -static pcb_bool ADD_PAD_TO_LIST(pcb_cardinal_t L, pcb_pad_t *Pad, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_PAD_TO_LIST(pcb_cardinal_t L, pcb_pad_t *Pad, int from_type, void *from_ptr, pcb_found_conn_type_t type) { /*fprintf(stderr, "ADD_PAD_TO_LIST cardinal %d %p %d\n", L, Pad, from_type);*/ if (User) @@ -82,7 +82,7 @@ return pcb_false; } -static pcb_bool ADD_LINE_TO_LIST(pcb_cardinal_t L, pcb_line_t *Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_LINE_TO_LIST(pcb_cardinal_t L, pcb_line_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_LINE, LAYER_PTR(L), (Ptr), (Ptr)); @@ -99,7 +99,7 @@ return pcb_false; } -static pcb_bool ADD_ARC_TO_LIST(pcb_cardinal_t L, pcb_arc_t *Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_ARC_TO_LIST(pcb_cardinal_t L, pcb_arc_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_ARC, LAYER_PTR(L), (Ptr), (Ptr)); @@ -116,7 +116,7 @@ return pcb_false; } -static pcb_bool ADD_RAT_TO_LIST(pcb_rat_t *Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_RAT_TO_LIST(pcb_rat_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_RATLINE, (Ptr), (Ptr), (Ptr)); @@ -133,7 +133,7 @@ return pcb_false; } -static pcb_bool ADD_POLYGON_TO_LIST(pcb_cardinal_t L, pcb_polygon_t *Ptr, int from_type, void *from_ptr, found_conn_type_t type) +static pcb_bool ADD_POLYGON_TO_LIST(pcb_cardinal_t L, pcb_polygon_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type) { if (User) AddObjectToFlagUndoList(PCB_TYPE_POLYGON, LAYER_PTR(L), (Ptr), (Ptr)); Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 4782) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 4783) @@ -61,7 +61,7 @@ int to_type; int edges; /* number of edges */ AnyObjectType *to; - found_conn_type_t type; + pcb_found_conn_type_t type; short_conn_t *next; }; @@ -69,7 +69,7 @@ static int num_short_conns = 0; static int short_conns_maxid = 0; -static void proc_short_cb(int current_type, void *current_obj, int from_type, void *from_obj, found_conn_type_t type) +static void proc_short_cb(int current_type, void *current_obj, int from_type, void *from_obj, pcb_found_conn_type_t type) { AnyObjectType *curr = current_obj, *from = from_obj; short_conn_t *s;