Changeset 09489b89 for owl.c

Timestamp:

Jul 2, 2003, 6:15:24 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:

373b7e7

Parents:

7c9c847

Message:

First pass at making owl build without zephyr

File:

• owl.c (modified) (5 diffs)

owl.c

@@ -15 +15 @@
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr/zephyr.h>
 #include <com_err.h>
 #include <signal.h>
@@ -41 +40 @@
   struct tm *today;
   char *dir;
+#ifdef HAVE_LIBZEPHYR
   ZNotice_t notice;
+#endif
 
   argcsave=argc;
@@ -133 +134 @@
   if (debug) owl_global_set_debug_on(&g);
   owl_global_set_startupargs(&g, argcsave, argvsave);
-
+#ifdef HAVE_LIBZEPHYR
+  owl_global_set_havezephyr(&g);
+#endif
+  owl_global_set_haveaim(&g);
+  
   /* create the owl directory, in case it does not exist */
   dir=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_CONFIG_DIR);
@@ -340 +345 @@
     zpendcount=0;
     while(owl_zephyr_zpending() || owl_global_messagequeue_pending(&g)) {
+#ifdef HAVE_LIBZEPHYR
       struct sockaddr_in from;
+#endif
       owl_message *m;
       owl_filter *f;
-      
+
       /* grab the new message, stick it in 'm' */
       if (owl_zephyr_zpending()) {
+#ifdef HAVE_LIBZEPHYR
         /* grab a zephyr notice, but if we've done 20 without stopping,
            take a break to process keystrokes etc. */
@@ -366 +374 @@
         m=owl_malloc(sizeof(owl_message));
         owl_message_create_from_znotice(m, &notice);
+#endif
       } else if (owl_global_messagequeue_pending(&g)) {
         m=owl_global_messageuque_popmsg(&g);