svn merge -r10366:10387 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

f9030226 · Christopher J. Morrone · 95e5fb9c · f9030226
Commit f9030226 authored 18 years ago by Christopher J. Morrone
--- a/src/common/eio.c
+++ b/src/common/eio.c
@@ -290,7 +290,7 @@ _poll_handle_event(short revents, eio_obj_t *obj, List objList)
 	bool read_called = false;
 	bool write_called = false;

-	if (revents & POLLERR || revents & POLLNVAL) {
+	if (revents & (POLLERR|POLLNVAL)) {
 		if (obj->ops->handle_error) {
 			(*obj->ops->handle_error) (obj, objList);
 		} else if (obj->ops->handle_read) {