Changeset be0a79f for owl.c

Timestamp:

Jun 21, 2003, 1:54:20 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

0c502e9

Parents:

5639bf2

Message:

Started work making owl build without zephyr.  Long way left to go though.

File:

• owl.c (modified) (4 diffs)

owl.c

@@ -41 +41 @@
   struct tm *today;
   char *dir;
+  ZNotice_t notice;
 
   argcsave=argc;
@@ -89 +90 @@
   }
 
+#ifdef HAVE_LIBZEPHYR
   /* zephyr init */
-  if ((ret = ZInitialize()) != ZERR_NONE) {
-    com_err("owl",ret,"while initializing");
+  ret=owl_zephyr_initialize();
+  if (ret) {
     exit(1);
   }
-  if ((ret = ZOpenPort(NULL)) != ZERR_NONE) {
-    com_err("owl",ret,"while opening port");
-    exit(1);
-  }
-
+#endif
+  
   /* signal handler */
   sigact.sa_handler=sig_handler;
@@ -336 +335 @@
     newmsgs=0;
     zpendcount=0;
-    while(ZPending() || owl_global_messagequeue_pending(&g)) {
-      ZNotice_t notice;
+    while(owl_zephyr_zpending() || owl_global_messagequeue_pending(&g)) {
       struct sockaddr_in from;
       owl_message *m;
@@ -343 +341 @@
       
       /* grab the new message, stick it in 'm' */
-      if (ZPending()) {
+      if (owl_zephyr_zpending()) {
         /* grab a zephyr notice, but if we've done 20 without stopping,
            take a break to process keystrokes etc. */