Changeset b848e30

Timestamp:

May 24, 2011, 12:10:29 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

f1c845b, 2d415cc

Parents:

33b6431b

git-author:

David Benjamin <davidben@mit.edu> (05/24/11 00:09:35)

git-committer:

David Benjamin <davidben@mit.edu> (05/24/11 00:10:29)

Message:

Fix the build on libzephyr-less machines

Just don't compile the event source functions at all. There's no good
reason to use them without libzephyr support. We should really move
towards not building zephyr.c in that case anyway.

File:

• zephyr.c (modified) (5 diffs)

zephyr.c

@@ -7 +7 @@
 #include "owl.h"
 
+#ifdef HAVE_LIBZEPHYR
 static GSource *owl_zephyr_event_source_new(int fd);
 
@@ -13 +14 @@
 static gboolean owl_zephyr_event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data);
 
-#ifdef HAVE_LIBZEPHYR
 static GList *deferred_subs = NULL;
 
@@ -1451 +1451 @@
 #define OWL_MAX_ZEPHYRGRAMS_TO_PROCESS 20
 
+#ifdef HAVE_LIBZEPHYR
 static int _owl_zephyr_process_events(void)
 {
   int zpendcount=0;
-#ifdef HAVE_LIBZEPHYR
   ZNotice_t notice;
   Code_t code;
@@ -1495 +1495 @@
     }
   }
-#endif
   return zpendcount;
 }
@@ -1533 +1532 @@
   return TRUE;
 }
+#endif