Changeset 596c22df

Timestamp:

Dec 24, 2006, 10:59:10 PM (18 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

ea67541

Parents:

bfbf590

git-author:

Nelson Elhage <nelhage@mit.edu> (12/24/06 22:59:02)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/24/06 22:59:10)

Message:

Moving zephyr initialization later, so that zephyr works again

File:

• owl.c (modified) (2 diffs)

owl.c

@@ -141 +141 @@
   owl_function_debugmsg("startup: Finished parsing arguments");
 
-#ifdef HAVE_LIBZEPHYR
-  /* zephyr init */
-  ret=owl_zephyr_initialize();
-  if (!ret)
-      owl_global_set_havezephyr(&g);
-#endif
-  
   /* signal handler */
   /*sigact.sa_handler=sig_handler;*/
@@ -201 +194 @@
   owl_global_set_startupargs(&g, argcsave, argvsave);
   owl_global_set_haveaim(&g);
+
+#ifdef HAVE_LIBZEPHYR
+  /* zephyr init */
+  ret=owl_zephyr_initialize();
+  if (!ret)
+      owl_global_set_havezephyr(&g);
+#endif
 
 #if OWL_STDERR_REDIR