Changeset dcc3f80 for zephyr.c


Ignore:
Timestamp:
Oct 10, 2009, 9:24:41 PM (12 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
68ab07c
Parents:
69c3878 (diff), 32ad44d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge branch 'zephyr-fixes'
File:
1 edited

Legend:

Unmodified
Added
Removed
  • zephyr.c

    rdca3b27 rdcc3f80  
    8282void owl_zephyr_finish_initialization(owl_dispatch *d) {
    8383  Code_t code;
     84  char *perl;
    8485
    8586  owl_select_remove_dispatch(d->fd);
     
    125126    owl_function_zephyr_buddy_check(0);
    126127  }
     128
     129 perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
     130 owl_free(perl);
    127131}
    128132
     
    168172  }
    169173#endif
    170   return(0);
     174  return 0;
    171175}
    172176
     
    176180  if(owl_global_is_havezephyr(&g))
    177181    return(ZPending());
    178   else
    179     return 0;
    180 #else
    181   return(0);
    182 #endif
     182#endif
     183  return 0;
    183184}
    184185
     
    186187{
    187188#ifdef HAVE_LIBZEPHYR
    188   return(ZGetRealm());
    189 #else
    190   return("");
    191 #endif
     189  if (owl_global_is_havezephyr(&g))
     190    return(ZGetRealm());
     191#endif
     192  return "";
    192193}
    193194
     
    195196{
    196197#ifdef HAVE_LIBZEPHYR
    197   return(ZGetSender());
    198 #else
    199   return("");
    200 #endif
     198  if (owl_global_is_havezephyr(&g))
     199    return(ZGetSender());
     200#endif
     201  return "";
    201202}
    202203
Note: See TracChangeset for help on using the changeset viewer.