Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 308) +++ trunk/src/Makefile.dep (revision 309) @@ -4,27 +4,27 @@ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h action.h autoplace.h autoroute.h buffer.h change.h command.h \ copy.h create.h crosshair.h data.h draw.h error.h file.h find.h insert.h \ - line.h mymem.h misc.h mirror.h move.h polygon.h rats.h remove.h report.h \ - rotate.h rubberband.h search.h select.h set.h thermal.h undo.h rtree.h \ - pcb-printf.h + line.h mymem.h misc.h ds.h mirror.h move.h polygon.h rats.h remove.h \ + report.h rotate.h rubberband.h search.h select.h set.h thermal.h undo.h \ + rtree.h pcb-printf.h autoplace.o: autoplace.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h autoplace.h box.h misc.h mymem.h compat.h data.h draw.h \ + libpcb_fp.h autoplace.h box.h misc.h ds.h mymem.h compat.h data.h draw.h \ error.h intersect.h rtree.h mirror.h move.h rats.h remove.h rotate.h autoroute.o: autoroute.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h autoroute.h box.h misc.h mymem.h create.h draw.h \ + libpcb_fp.h data.h autoroute.h box.h misc.h ds.h mymem.h create.h draw.h \ error.h find.h heap.h rtree.h mtspace.h vector.h polygon.h rats.h \ remove.h thermal.h undo.h pcb-printf.h buffer.o: buffer.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h buffer.h copy.h create.h crosshair.h data.h error.h mymem.h \ - mirror.h misc.h parse_l.h polygon.h rats.h rotate.h remove.h rtree.h \ - search.h select.h set.h + mirror.h misc.h ds.h parse_l.h polygon.h rats.h rotate.h remove.h \ + rtree.h search.h select.h set.h change.o: change.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h change.h create.h crosshair.h data.h draw.h error.h mymem.h \ - misc.h mirror.h polygon.h rats.h remove.h rtree.h search.h select.h \ + misc.h ds.h mirror.h polygon.h rats.h remove.h rtree.h search.h select.h \ set.h thermal.h undo.h clip.o: clip.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ @@ -32,21 +32,21 @@ command.o: command.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h action.h buffer.h command.h data.h djopt.h error.h file.h \ - mymem.h misc.h rats.h set.h vendor.h + mymem.h misc.h ds.h rats.h set.h vendor.h compat.o: compat.c ../config.h ../config.manual.h ../config.auto.h \ compat.h global.h const.h ../globalconst.h ../config.h macro.h hid.h \ polyarea.h libpcb_fp.h copy.o: copy.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h copy.h create.h data.h draw.h mymem.h mirror.h misc.h move.h \ - polygon.h rats.h rtree.h select.h undo.h + libpcb_fp.h copy.h create.h data.h draw.h mymem.h mirror.h misc.h ds.h \ + move.h polygon.h rats.h rtree.h select.h undo.h create.o: create.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h create.h data.h draw.h error.h mymem.h misc.h parse_l.h \ + libpcb_fp.h create.h data.h draw.h error.h mymem.h misc.h ds.h parse_l.h \ pcb-printf.h polygon.h rtree.h search.h set.h undo.h vendor.h crosshair.o: crosshair.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h crosshair.h data.h draw.h error.h line.h misc.h mymem.h \ + libpcb_fp.h crosshair.h data.h draw.h error.h line.h misc.h ds.h mymem.h \ search.h polygon.h data.o: data.c ../config.h ../config.manual.h ../config.auto.h data.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ @@ -58,21 +58,21 @@ draw.o: draw.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h compat.h crosshair.h data.h draw.h error.h mymem.h misc.h \ - rotate.h rtree.h search.h select.h print.h + ds.h rotate.h rtree.h search.h select.h print.h drill.o: drill.c ../config.h ../config.manual.h ../config.auto.h data.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h error.h mymem.h error.o: error.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h error.h file.h misc.h mymem.h + libpcb_fp.h data.h error.h file.h misc.h ds.h mymem.h file.o: file.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h buffer.h change.h create.h crosshair.h data.h edif_parse.h \ - error.h file.h misc.h mymem.h move.h parse_l.h pcb-printf.h polygon.h \ - rats.h remove.h set.h strflags.h portability.h + error.h file.h misc.h ds.h mymem.h move.h parse_l.h pcb-printf.h \ + polygon.h rats.h remove.h set.h strflags.h portability.h find.o: find.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h crosshair.h data.h draw.h error.h find.h mymem.h misc.h \ + libpcb_fp.h crosshair.h data.h draw.h error.h find.h mymem.h misc.h ds.h \ rtree.h polygon.h pcb-printf.h search.h set.h undo.h rats.h flags.o: flags.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ @@ -79,7 +79,7 @@ libpcb_fp.h data.h pcb-printf.h fontmode.o: fontmode.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h create.h data.h draw.h misc.h mymem.h move.h remove.h \ + libpcb_fp.h create.h data.h draw.h misc.h ds.h mymem.h move.h remove.h \ rtree.h strflags.h undo.h pcb-printf.h free_atexit.o: free_atexit.c heap.o: heap.c ../config.h ../config.manual.h ../config.auto.h global.h \ @@ -88,49 +88,50 @@ insert.o: insert.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h copy.h create.h crosshair.h data.h draw.h insert.h line.h \ - misc.h mymem.h move.h polygon.h rtree.h search.h select.h set.h undo.h + misc.h ds.h mymem.h move.h polygon.h rtree.h search.h select.h set.h \ + undo.h intersect.o: intersect.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h data.h intersect.h mymem.h line.o: line.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h crosshair.h find.h line.h misc.h mymem.h rtree.h + libpcb_fp.h data.h crosshair.h find.h line.h misc.h ds.h mymem.h rtree.h lrealpath.o: lrealpath.c ../config.h ../config.manual.h ../config.auto.h \ lrealpath.h main.o: main.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h data.h buffer.h create.h crosshair.h draw.h error.h file.h \ - set.h action.h misc.h mymem.h lrealpath.h free_atexit.h polygon.h \ + set.h action.h misc.h ds.h mymem.h lrealpath.h free_atexit.h polygon.h \ pcb-printf.h hid/common/actions.h hid/hidint.h dolists.h action_list.h mirror.o: mirror.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h draw.h mirror.h misc.h mymem.h polygon.h search.h \ - select.h set.h + libpcb_fp.h data.h draw.h mirror.h misc.h ds.h mymem.h polygon.h \ + search.h select.h set.h misc.o: misc.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h box.h misc.h mymem.h crosshair.h create.h data.h draw.h \ + libpcb_fp.h box.h misc.h ds.h mymem.h crosshair.h create.h data.h draw.h \ file.h error.h move.h pcb-printf.h polygon.h remove.h rtree.h rotate.h \ rubberband.h search.h set.h undo.h action.h portability.h move.o: move.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h create.h crosshair.h data.h draw.h error.h misc.h mymem.h \ - move.h polygon.h rtree.h search.h select.h thermal.h undo.h + libpcb_fp.h create.h crosshair.h data.h draw.h error.h misc.h ds.h \ + mymem.h move.h polygon.h rtree.h search.h select.h thermal.h undo.h mtspace.o: mtspace.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h box.h misc.h mymem.h heap.h rtree.h mtspace.h vector.h + libpcb_fp.h box.h misc.h ds.h mymem.h heap.h rtree.h mtspace.h vector.h mymem.o: mymem.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h error.h mymem.h misc.h rats.h rtree.h + libpcb_fp.h data.h error.h mymem.h misc.h ds.h rats.h rtree.h netlist.o: netlist.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h action.h buffer.h command.h data.h djopt.h error.h file.h \ - find.h mymem.h misc.h rats.h set.h vendor.h create.h + find.h mymem.h misc.h ds.h rats.h set.h vendor.h create.h pcb-printf.o: pcb-printf.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ hid.h polyarea.h libpcb_fp.h pcb-printf.h polygon.o: polygon.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h box.h misc.h mymem.h create.h crosshair.h data.h draw.h \ + libpcb_fp.h box.h misc.h ds.h mymem.h create.h crosshair.h data.h draw.h \ error.h find.h move.h pcb-printf.h polygon.h remove.h rtree.h search.h \ set.h thermal.h undo.h polygon1.o: polygon1.c global.h ../config.h ../config.manual.h \ @@ -138,64 +139,64 @@ polyarea.h libpcb_fp.h rtree.h heap.h puller.o: puller.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h create.h data.h draw.h misc.h mymem.h move.h pcb-printf.h \ - remove.h rtree.h strflags.h undo.h + libpcb_fp.h create.h data.h draw.h misc.h ds.h mymem.h move.h \ + pcb-printf.h remove.h rtree.h strflags.h undo.h print.o: print.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h draw.h drill.h file.h find.h error.h misc.h mymem.h \ - print.h polygon.h rtree.h search.h + libpcb_fp.h data.h draw.h drill.h file.h find.h error.h misc.h ds.h \ + mymem.h print.h polygon.h rtree.h search.h rats.o: rats.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h create.h data.h draw.h error.h file.h find.h misc.h mymem.h \ - polygon.h rats.h search.h set.h undo.h rats_mincut.h + libpcb_fp.h create.h data.h draw.h error.h file.h find.h misc.h ds.h \ + mymem.h polygon.h rats.h search.h set.h undo.h rats_mincut.h rats_mincut.o: rats_mincut.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ hid.h polyarea.h libpcb_fp.h create.h data.h draw.h error.h file.h \ - find.h misc.h mymem.h polygon.h rats.h search.h set.h undo.h \ + find.h misc.h ds.h mymem.h polygon.h rats.h search.h set.h undo.h \ pcb-mincut/graph.h pcb-mincut/solve.h pcb-mincut/graph.h remove.o: remove.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h draw.h error.h misc.h mymem.h move.h polygon.h rats.h \ - remove.h rtree.h search.h select.h set.h undo.h + libpcb_fp.h data.h draw.h error.h misc.h ds.h mymem.h move.h polygon.h \ + rats.h remove.h rtree.h search.h select.h set.h undo.h report.o: report.c ../config.h ../config.manual.h ../config.auto.h \ report.h global.h const.h ../globalconst.h ../config.h macro.h hid.h \ polyarea.h libpcb_fp.h crosshair.h data.h drill.h error.h search.h \ - misc.h mymem.h rats.h rtree.h strflags.h undo.h find.h draw.h \ + misc.h ds.h mymem.h rats.h rtree.h strflags.h undo.h find.h draw.h \ pcb-printf.h rotate.o: rotate.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h crosshair.h data.h draw.h error.h misc.h mymem.h polygon.h \ - rotate.h rtree.h rubberband.h search.h select.h set.h undo.h + libpcb_fp.h crosshair.h data.h draw.h error.h misc.h ds.h mymem.h \ + polygon.h rotate.h rtree.h rubberband.h search.h select.h set.h undo.h rtree.o: rtree.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h mymem.h rtree.h rubberband.o: rubberband.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h create.h data.h error.h misc.h mymem.h \ + hid.h polyarea.h libpcb_fp.h create.h data.h error.h misc.h ds.h mymem.h \ polygon.h rubberband.h rtree.h search.h search.o: search.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h box.h misc.h mymem.h data.h draw.h error.h find.h polygon.h \ - rtree.h search.h + libpcb_fp.h box.h misc.h ds.h mymem.h data.h draw.h error.h find.h \ + polygon.h rtree.h search.h select.o: select.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h data.h draw.h error.h search.h select.h undo.h rats.h misc.h \ - mymem.h find.h + ds.h mymem.h find.h set.o: set.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h action.h buffer.h compat.h crosshair.h data.h draw.h error.h \ - find.h misc.h mymem.h set.h undo.h + find.h misc.h ds.h mymem.h set.h undo.h strflags.o: strflags.c ../config.h ../config.manual.h ../config.auto.h \ ../globalconst.h ../config.h global.h const.h macro.h hid.h polyarea.h \ libpcb_fp.h compat.h strflags.h thermal.o: thermal.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h create.h data.h draw.h error.h misc.h mymem.h move.h \ + libpcb_fp.h create.h data.h draw.h error.h misc.h ds.h mymem.h move.h \ polygon.h rtree.h thermal.h undo.h undo.o: undo.c ../config.h ../config.manual.h ../config.auto.h global.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h buffer.h change.h create.h data.h draw.h error.h insert.h \ - misc.h mymem.h mirror.h move.h polygon.h remove.h rotate.h rtree.h \ + misc.h ds.h mymem.h mirror.h move.h polygon.h remove.h rotate.h rtree.h \ search.h set.h undo.h strflags.h vector.o: vector.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ @@ -210,12 +211,12 @@ hid/common/../hidint.h flags.o: hid/common/flags.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h data.h global.h misc.h mymem.h hid.h \ + hid.h polyarea.h libpcb_fp.h data.h global.h misc.h ds.h mymem.h hid.h \ hid/common/../hidint.h hidinit.o: hid/common/hidinit.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ hid.h polyarea.h libpcb_fp.h hid.h hid/common/hidnogui.h \ - hid/common/../hidint.h compat.h error.h misc.h global.h mymem.h \ + hid/common/../hidint.h compat.h error.h misc.h global.h ds.h mymem.h \ portability.h pcb-printf.h hid/common/hidlist.h hidnogui.o: hid/common/hidnogui.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ @@ -243,24 +244,25 @@ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h data.h portability.o: portability.c ../config.h ../config.manual.h \ + ../config.auto.h ds.h global.h const.h ../globalconst.h ../config.h \ + macro.h hid.h polyarea.h libpcb_fp.h error.h mymem.h +ds.o: ds.c ds.h +libpcb_fp.o: libpcb_fp.c ds.h ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h error.h mymem.h -libpcb_fp.o: libpcb_fp.c ../config.h ../config.manual.h ../config.auto.h \ - global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h error.h portability.h + hid.h polyarea.h libpcb_fp.h error.h portability.h parse_y.o: parse_y.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h create.h data.h error.h file.h mymem.h misc.h parse_l.h \ + libpcb_fp.h create.h data.h error.h file.h mymem.h misc.h ds.h parse_l.h \ polygon.h remove.h rtree.h strflags.h thermal.h parse_y.h parse_l.o: parse_l.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h crosshair.h data.h error.h file.h mymem.h misc.h strflags.h \ - parse_l.h parse_y.h create.h + libpcb_fp.h crosshair.h data.h error.h file.h mymem.h misc.h ds.h \ + strflags.h parse_l.h parse_y.h create.h ghid-cell-renderer-visibility.o: hid/gtk/ghid-cell-renderer-visibility.c \ hid/gtk/gtkhid.h hid/gtk/gui.h global.h ../config.h ../config.manual.h \ ../config.auto.h const.h ../globalconst.h ../config.h macro.h hid.h \ polyarea.h libpcb_fp.h hid.h hid/common/hid_resource.h resource.h data.h \ - global.h misc.h mymem.h hid/gtk/ghid-coord-entry.h \ + global.h misc.h ds.h mymem.h hid/gtk/ghid-coord-entry.h \ hid/gtk/ghid-main-menu.h hid/gtk/ghid-layer-selector.h \ hid/gtk/ghid-route-style-selector.h hid/gtk/gui-pinout-preview.h \ hid/gtk/ghid-cell-renderer-visibility.h @@ -268,7 +270,7 @@ hid/gtk/gui.h global.h ../config.h ../config.manual.h ../config.auto.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h hid.h hid/common/hid_resource.h resource.h data.h global.h \ - misc.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ + misc.h ds.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h pcb-printf.h ghid-layer-selector.o: hid/gtk/ghid-layer-selector.c hid/gtk/gtkhid.h \ @@ -275,7 +277,7 @@ hid/gtk/gui.h global.h ../config.h ../config.manual.h ../config.auto.h \ const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ libpcb_fp.h hid.h hid/common/hid_resource.h resource.h data.h global.h \ - misc.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ + misc.h ds.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h pcb-printf.h \ hid/gtk/ghid-cell-renderer-visibility.h @@ -282,7 +284,7 @@ ghid-main-menu.o: hid/gtk/ghid-main-menu.c hid/gtk/gtkhid.h hid/gtk/gui.h \ global.h ../config.h ../config.manual.h ../config.auto.h const.h \ ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h pcb-printf.h @@ -290,7 +292,7 @@ ../config.h ../config.manual.h ../config.auto.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid/gtk/gtkhid.h \ hid/gtk/gui.h hid.h hid/common/hid_resource.h resource.h data.h global.h \ - misc.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ + misc.h ds.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h pcb-printf.h gtkhid-main.o: hid/gtk/gtkhid-main.c ../config.h ../config.manual.h \ @@ -297,7 +299,7 @@ ../config.auto.h action.h global.h const.h ../globalconst.h ../config.h \ macro.h hid.h polyarea.h libpcb_fp.h crosshair.h error.h \ hid/gtk/../hidint.h hid/gtk/gui.h global.h hid.h \ - hid/common/hid_resource.h resource.h data.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h hid/common/hidnogui.h \ @@ -305,7 +307,7 @@ gui-command-window.o: hid/gtk/gui-command-window.c ../config.h \ ../config.manual.h ../config.auto.h hid/gtk/gui.h global.h const.h \ ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h command.h crosshair.h @@ -312,7 +314,7 @@ gui-config.o: hid/gtk/gui-config.c ../config.h ../config.manual.h \ ../config.auto.h hid/gtk/gui.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h hid/gtk/../hidint.h hid/gtk/gtkhid.h \ @@ -320,7 +322,7 @@ gui-dialog-print.o: hid/gtk/gui-dialog-print.c ../config.h \ ../config.manual.h ../config.auto.h hid/gtk/gui.h global.h const.h \ ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h pcb-printf.h @@ -327,7 +329,7 @@ gui-dialog.o: hid/gtk/gui-dialog.c ../config.h ../config.manual.h \ ../config.auto.h data.h global.h const.h ../globalconst.h ../config.h \ macro.h hid.h polyarea.h libpcb_fp.h hid/gtk/gui.h global.h hid.h \ - hid/common/hid_resource.h resource.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h command.h @@ -335,7 +337,7 @@ ../config.auto.h error.h search.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h draw.h pcb-printf.h \ undo.h set.h hid/gtk/gui.h global.h hid.h hid/common/hid_resource.h \ - resource.h data.h misc.h mymem.h hid/gtk/ghid-coord-entry.h \ + resource.h data.h misc.h ds.h mymem.h hid/gtk/ghid-coord-entry.h \ hid/gtk/ghid-main-menu.h hid/gtk/ghid-layer-selector.h \ hid/gtk/ghid-route-style-selector.h hid/gtk/gui-pinout-preview.h \ hid/gtk/gui-drc-window.h @@ -342,7 +344,7 @@ gui-keyref-window.o: hid/gtk/gui-keyref-window.c ../config.h \ ../config.manual.h ../config.auto.h hid/gtk/gui.h global.h const.h \ ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h @@ -349,7 +351,7 @@ gui-library-window.o: hid/gtk/gui-library-window.c ../config.h \ ../config.manual.h ../config.auto.h hid/gtk/gui.h global.h const.h \ ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h buffer.h set.h hid/gtk/gui-library-window.h @@ -356,14 +358,14 @@ gui-log-window.o: hid/gtk/gui-log-window.c ../config.h ../config.manual.h \ ../config.auto.h hid/gtk/gui.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h pcb-printf.h gui-misc.o: hid/gtk/gui-misc.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h crosshair.h global.h data.h misc.h mymem.h \ - action.h set.h pcb-printf.h hid/gtk/gui.h hid.h \ + hid.h polyarea.h libpcb_fp.h crosshair.h global.h data.h misc.h ds.h \ + mymem.h action.h set.h pcb-printf.h hid/gtk/gui.h hid.h \ hid/common/hid_resource.h resource.h hid/gtk/ghid-coord-entry.h \ hid/gtk/ghid-main-menu.h hid/gtk/ghid-layer-selector.h \ hid/gtk/ghid-route-style-selector.h hid/gtk/gui-pinout-preview.h @@ -370,7 +372,7 @@ gui-netlist-window.o: hid/gtk/gui-netlist-window.c ../config.h \ ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h create.h global.h \ - data.h draw.h error.h find.h misc.h mymem.h mymem.h rats.h remove.h \ + data.h draw.h error.h find.h misc.h ds.h mymem.h mymem.h rats.h remove.h \ search.h select.h set.h undo.h hid/gtk/gui.h hid.h \ hid/common/hid_resource.h resource.h hid/gtk/ghid-coord-entry.h \ hid/gtk/ghid-main-menu.h hid/gtk/ghid-layer-selector.h \ @@ -378,7 +380,7 @@ gui-output-events.o: hid/gtk/gui-output-events.c ../config.h \ ../config.manual.h ../config.auto.h hid/gtk/gui.h global.h const.h \ ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h hid/gtk/gtkhid.h action.h crosshair.h \ @@ -386,7 +388,7 @@ gui-pinout-preview.o: hid/gtk/gui-pinout-preview.c ../config.h \ ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid/gtk/gui.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h copy.h draw.h mymem.h move.h rotate.h @@ -393,7 +395,7 @@ gui-pinout-window.o: hid/gtk/gui-pinout-window.c ../config.h \ ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid/gtk/gui.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h copy.h draw.h mymem.h move.h rotate.h @@ -402,7 +404,7 @@ hid/gtk/ghid-route-style-selector.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid/gtk/gtkhid.h \ hid/gtk/gui.h hid.h hid/common/hid_resource.h resource.h data.h global.h \ - misc.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ + misc.h ds.h mymem.h hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/gui-pinout-preview.h hid/gtk/../hidint.h action.h autoplace.h \ autoroute.h buffer.h change.h command.h copy.h create.h crosshair.h \ draw.h error.h file.h find.h gpcb-menu.h insert.h line.h mymem.h move.h \ @@ -412,7 +414,7 @@ gui-utils.o: hid/gtk/gui-utils.c ../config.h ../config.manual.h \ ../config.auto.h hid/gtk/gui.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h hid.h \ - hid/common/hid_resource.h resource.h data.h global.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h global.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h @@ -420,49 +422,49 @@ ../config.auto.h crosshair.h global.h const.h ../globalconst.h \ ../config.h macro.h hid.h polyarea.h libpcb_fp.h clip.h \ hid/gtk/../hidint.h hid/gtk/gui.h global.h hid.h \ - hid/common/hid_resource.h resource.h data.h misc.h mymem.h \ + hid/common/hid_resource.h resource.h data.h misc.h ds.h mymem.h \ hid/gtk/ghid-coord-entry.h hid/gtk/ghid-main-menu.h \ hid/gtk/ghid-layer-selector.h hid/gtk/ghid-route-style-selector.h \ hid/gtk/gui-pinout-preview.h hid/common/draw_helpers.h toporouter.o: toporouter.c toporouter.h data.h global.h ../config.h \ ../config.manual.h ../config.auto.h const.h ../globalconst.h ../config.h \ - macro.h hid.h polyarea.h libpcb_fp.h autoroute.h box.h misc.h mymem.h \ - create.h draw.h error.h find.h heap.h rtree.h polygon.h rats.h remove.h \ - thermal.h undo.h ../gts/gts.h pcb-printf.h + macro.h hid.h polyarea.h libpcb_fp.h autoroute.h box.h misc.h ds.h \ + mymem.h create.h draw.h error.h find.h heap.h rtree.h polygon.h rats.h \ + remove.h thermal.h undo.h ../gts/gts.h pcb-printf.h batch.o: hid/batch/batch.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h hid.h data.h global.h misc.h mymem.h \ + hid.h polyarea.h libpcb_fp.h hid.h data.h global.h misc.h ds.h mymem.h \ hid/batch/../hidint.h pcb-printf.h hid/common/draw_helpers.h \ hid/common/hidnogui.h hid/common/actions.h hid/common/hidinit.h \ dolists.h bom.o: hid/bom/bom.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h global.h error.h misc.h mymem.h pcb-printf.h hid.h \ - hid/common/hidnogui.h hid/bom/../hidint.h + libpcb_fp.h data.h global.h error.h misc.h ds.h mymem.h pcb-printf.h \ + hid.h hid/common/hidnogui.h hid/bom/../hidint.h ps.o: hid/ps/ps.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h global.h misc.h mymem.h error.h draw.h pcb-printf.h \ - hid.h hid/ps/../hidint.h hid/common/hidnogui.h hid/common/draw_helpers.h \ - hid/ps/../ps/ps.h hid/ps/../../print.h hid/ps/../../global.h \ - hid/common/hidinit.h dolists.h + libpcb_fp.h data.h global.h misc.h ds.h mymem.h error.h draw.h \ + pcb-printf.h hid.h hid/ps/../hidint.h hid/common/hidnogui.h \ + hid/common/draw_helpers.h hid/ps/../ps/ps.h hid/ps/../../print.h \ + hid/ps/../../global.h hid/common/hidinit.h dolists.h eps.o: hid/ps/eps.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h global.h misc.h mymem.h pcb-printf.h hid.h \ + libpcb_fp.h data.h global.h misc.h ds.h mymem.h pcb-printf.h hid.h \ hid/ps/../hidint.h hid/common/hidnogui.h hid/common/draw_helpers.h \ hid/ps/../ps/ps.h hid/common/hidinit.h png.o: hid/png/png.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h global.h error.h misc.h mymem.h hid.h \ + libpcb_fp.h data.h global.h error.h misc.h ds.h mymem.h hid.h \ hid/png/../hidint.h hid/common/hidnogui.h hid/common/draw_helpers.h \ hid/png/png.h hid/common/hidinit.h dolists.h gerber.o: hid/gerber/gerber.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h data.h global.h misc.h mymem.h error.h \ + hid.h polyarea.h libpcb_fp.h data.h global.h misc.h ds.h mymem.h error.h \ draw.h pcb-printf.h hid.h hid/gerber/../hidint.h hid/common/hidnogui.h \ hid/common/draw_helpers.h hid/common/hidinit.h gcode.o: hid/gcode/gcode.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h error.h data.h global.h misc.h mymem.h \ + hid.h polyarea.h libpcb_fp.h error.h data.h global.h misc.h ds.h mymem.h \ rats.h hid.h hid/gcode/../hidint.h hid/common/hidnogui.h \ hid/common/draw_helpers.h hid/gcode/gcode.h hid/gcode/bitmap.h \ hid/gcode/potracelib.h hid/gcode/curve.h hid/gcode/auxiliary.h \ @@ -481,10 +483,11 @@ ../config.auto.h nelma.o: hid/nelma/nelma.c ../config.h ../config.manual.h \ ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ - hid.h polyarea.h libpcb_fp.h error.h data.h global.h misc.h mymem.h \ + hid.h polyarea.h libpcb_fp.h error.h data.h global.h misc.h ds.h mymem.h \ rats.h hid.h hid/nelma/../hidint.h hid/common/hidnogui.h \ hid/common/draw_helpers.h hid/common/hidinit.h dolists.h lpr.o: hid/lpr/lpr.c ../config.h ../config.manual.h ../config.auto.h \ global.h const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ - libpcb_fp.h data.h global.h misc.h mymem.h hid.h hid/lpr/../hidint.h \ - hid/lpr/../ps/ps.h hid/common/hidnogui.h hid/common/hidinit.h + libpcb_fp.h data.h global.h misc.h ds.h mymem.h hid.h \ + hid/lpr/../hidint.h hid/lpr/../ps/ps.h hid/common/hidnogui.h \ + hid/common/hidinit.h Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 308) +++ trunk/src/Makefile.in (revision 309) @@ -71,6 +71,7 @@ res_lex.o edif.o portability.o + ds.o libpcb_fp.o parse_y.o parse_l.o Index: trunk/src/ds.c =================================================================== --- trunk/src/ds.c (nonexistent) +++ trunk/src/ds.c (revision 309) @@ -0,0 +1,55 @@ +#include + +/* --------------------------------------------------------------------------- + * reallocates memory for a dynamic length string if necessary + */ +static void +DSRealloc (DynamicStringTypePtr Ptr, size_t Length) +{ + int input_null = (Ptr->Data == NULL); + if (input_null || Length >= Ptr->MaxLength) + { + Ptr->MaxLength = Length + 512; + Ptr->Data = (char *)realloc (Ptr->Data, Ptr->MaxLength); + if (input_null) + Ptr->Data[0] = '\0'; + } +} + +/* --------------------------------------------------------------------------- + * adds one character to a dynamic string + */ +void +DSAddCharacter (DynamicStringTypePtr Ptr, char Char) +{ + size_t position = Ptr->Data ? strlen (Ptr->Data) : 0; + + DSRealloc (Ptr, position + 1); + Ptr->Data[position++] = Char; + Ptr->Data[position] = '\0'; +} + +/* --------------------------------------------------------------------------- + * add a string to a dynamic string + */ +void +DSAddString (DynamicStringTypePtr Ptr, const char *S) +{ + size_t position = Ptr->Data ? strlen (Ptr->Data) : 0; + + if (S && *S) + { + DSRealloc (Ptr, position + 1 + strlen (S)); + strcat (&Ptr->Data[position], S); + } +} + +/* ---------------------------------------------------------------------- + * clears a dynamic string + */ +void +DSClearString (DynamicStringTypePtr Ptr) +{ + if (Ptr->Data) + Ptr->Data[0] = '\0'; +} Index: trunk/src/ds.h =================================================================== --- trunk/src/ds.h (nonexistent) +++ trunk/src/ds.h (revision 309) @@ -0,0 +1,11 @@ +#include + +typedef struct +{ + size_t MaxLength; + char *Data; +} DynamicStringType, *DynamicStringTypePtr; + +void DSAddCharacter (DynamicStringTypePtr, char); +void DSAddString (DynamicStringTypePtr, const char *); +void DSClearString (DynamicStringTypePtr); Index: trunk/src/libpcb_fp.c =================================================================== --- trunk/src/libpcb_fp.c (revision 308) +++ trunk/src/libpcb_fp.c (revision 309) @@ -32,6 +32,8 @@ * on several architectures */ +#include "ds.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif Index: trunk/src/misc.h =================================================================== --- trunk/src/misc.h (revision 308) +++ trunk/src/misc.h (revision 309) @@ -33,6 +33,7 @@ #include #include "global.h" +#include "ds.h" #include "mymem.h" enum unitflags { UNIT_PERCENT = 1 }; Index: trunk/src/mymem.c =================================================================== --- trunk/src/mymem.c (revision 308) +++ trunk/src/mymem.c (revision 309) @@ -800,60 +800,6 @@ } /* --------------------------------------------------------------------------- - * reallocates memory for a dynamic length string if necessary - */ -static void -DSRealloc (DynamicStringTypePtr Ptr, size_t Length) -{ - int input_null = (Ptr->Data == NULL); - if (input_null || Length >= Ptr->MaxLength) - { - Ptr->MaxLength = Length + 512; - Ptr->Data = (char *)realloc (Ptr->Data, Ptr->MaxLength); - if (input_null) - Ptr->Data[0] = '\0'; - } -} - -/* --------------------------------------------------------------------------- - * adds one character to a dynamic string - */ -void -DSAddCharacter (DynamicStringTypePtr Ptr, char Char) -{ - size_t position = Ptr->Data ? strlen (Ptr->Data) : 0; - - DSRealloc (Ptr, position + 1); - Ptr->Data[position++] = Char; - Ptr->Data[position] = '\0'; -} - -/* --------------------------------------------------------------------------- - * add a string to a dynamic string - */ -void -DSAddString (DynamicStringTypePtr Ptr, const char *S) -{ - size_t position = Ptr->Data ? strlen (Ptr->Data) : 0; - - if (S && *S) - { - DSRealloc (Ptr, position + 1 + strlen (S)); - strcat (&Ptr->Data[position], S); - } -} - -/* ---------------------------------------------------------------------- - * clears a dynamic string - */ -void -DSClearString (DynamicStringTypePtr Ptr) -{ - if (Ptr->Data) - Ptr->Data[0] = '\0'; -} - -/* --------------------------------------------------------------------------- * strips leading and trailing blanks from the passed string and * returns a pointer to the new 'duped' one or NULL if the old one * holds only white space characters Index: trunk/src/mymem.h =================================================================== --- trunk/src/mymem.h (revision 308) +++ trunk/src/mymem.h (revision 309) @@ -59,11 +59,6 @@ /* --------------------------------------------------------------------------- * some memory types */ -typedef struct -{ - size_t MaxLength; - char *Data; -} DynamicStringType, *DynamicStringTypePtr; RubberbandTypePtr GetRubberbandMemory (void); PinTypePtr GetPinMemory (ElementTypePtr); @@ -98,9 +93,6 @@ void FreeLibraryMemory (LibraryTypePtr); void FreePointerListMemory (PointerListTypePtr); void DeleteLibraryMenuMemory (LibraryTypePtr lib, int menuidx); -void DSAddCharacter (DynamicStringTypePtr, char); -void DSAddString (DynamicStringTypePtr, const char *); -void DSClearString (DynamicStringTypePtr); char *StripWhiteSpaceAndDup (const char *); #ifdef NEED_STRDUP Index: trunk/src/portability.c =================================================================== --- trunk/src/portability.c (revision 308) +++ trunk/src/portability.c (revision 309) @@ -34,6 +34,8 @@ #include "config.h" #endif +#include "ds.h" + #include #include #include