I fixed my fix using poll()

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 1b56639227946d3deb3f9dea1d7aae7f710267dc..49dc2cac37b7799f4afd6258d71f13ed9f97b6bb 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -1386,8 +1386,8 @@ void makeGraphs(htmltbl_t * tbl, graph_t * rowg, graph_t * colg)
        ED_minlen(e) = x;
        /* ED_minlen(e) = cp->data.box.UR.x; */
 #if (DEBUG==2)
-       fprintf(stderr, "col edge %s -> %s %d\n", t->name, h->name,
-               ED_minlen(e));
+       fprintf(stderr, "col edge %s ", agnameof(t));
+       fprintf(stderr, "-> %s %d\n", agnameof(h), ED_minlen(e));
 #endif
        elist_append(e, ND_out(t));
        elist_append(e, ND_in(h));

diff --git a/plugin/xlib/gvdevice_xlib.c b/plugin/xlib/gvdevice_xlib.c
index bf288942fe34e2dc3ab6ce1d91cf58c32e2d59ab..417f3e128a615fb3f65bae58a66d4cc7f7118549 100644 (file)
--- a/plugin/xlib/gvdevice_xlib.c
+++ b/plugin/xlib/gvdevice_xlib.c
@@ -390,7 +390,7 @@ static int handle_stdin_events(GVJ_t *job, int stdin_fd)
     ufds[0].events = POLLIN;
        ufds[0].revents = 0;
     r = poll(ufds,1,0);
-       if (ufds[0].revents == POLLIN) return -1;
+       if (ufds[0].revents & POLLIN) return -1;
        /* Beware of bugs in the above code; I have only proved it correct, not tried it. */
 #endif
     (job->callbacks->read)(job, job->input_filename, job->layout_type);