On Mon, 2008-04-28 at 02:06 -0400, DJ Delorie wrote:
> I'm not going to try to apply and test these tonight; it's too late
> for me for that kind of stuff. Comments I can do though..
>
> > There's a typo in an assert() in rtree.c. The fix is to compare Y with
> > Y, not X, in the last >:
>
> OK.
>
> > The batch HID won't even build, because it's missing file watch and
> > block hook functions, and its progress function return type is wrong.
Sorry, file watch and block hooks were things I added to the HID struct
when adding DBus support to the Lesstif and GTK HIDs.
Untested patch attached, which stubs these out.
> I use it for the web server, so it doesn't get rebuilt often. I'll
> look into it unless Dan beats me to it.
It would be worth while checking this works OK... should not be any
issue if built without DBus support. Certainly DBus support won't work
right with these just being empty stubs.
--
Peter Clifton
Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA
Tel: +44 (0)7729 980173 - (No signal in the lab!)
Index: batch.c
===================================================================
RCS file: /cvsroot/pcb/pcb/src/hid/batch/batch.c,v
retrieving revision 1.11
diff -U3 -p -r1.11 batch.c
--- batch.c 13 Apr 2008 14:15:38 -0000 1.11
+++ batch.c 28 Apr 2008 06:26:52 -0000
@@ -329,6 +329,33 @@ batch_stop_timer (hidval timer)
{
}
+hidval
+batch_watch_file (int fd, unsigned int condition, void (*func) (hidval watch, int fd, unsigned int condition, hidval user_data),
+ hidval user_data)
+{
+ hidval ret;
+ ret.ptr = NULL;
+ return ret;
+}
+
+void
+batch_unwatch_file (hidval data)
+{
+}
+
+static hidval
+batch_add_block_hook (void (*func) (hidval data), hidval user_data )
+{
+ hidval ret;
+ ret.ptr = NULL;
+ return ret;
+}
+
+static void
+batch_stop_block_hook (hidval mlpoll)
+{
+}
+
static void
batch_log (const char *fmt, ...)
{
@@ -454,6 +481,10 @@ HID batch_gui = {
batch_set_crosshair,
batch_add_timer,
batch_stop_timer,
+ batch_watch_file,
+ batch_unwatch_file,
+ batch_add_block_hook,
+ batch_stop_block_hook,
batch_log,
batch_logv,
batch_confirm_dialog,
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
