From: Adam Dickmeiss Date: Wed, 9 May 2012 10:57:23 +0000 (+0200) Subject: Fixes for Windows compilation X-Git-Tag: v1.3.35~4^2 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;ds=sidebyside;h=9401913fbcdbead99f1180848f5fef0d02fd871e;hp=9ec9630d5b143f0fc57e999a7b7b1710f990e19f;p=metaproxy-moved-to-github.git Fixes for Windows compilation --- diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp index 481ad35..a75c4d4 100644 --- a/src/filter_zoom.cpp +++ b/src/filter_zoom.cpp @@ -1444,7 +1444,7 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b, } Z_Records *yf::Zoom::Frontend::get_explain_records( - Package &package, + mp::Package &package, Odr_int start, Odr_int number_to_present, int *error, @@ -1503,7 +1503,7 @@ Z_Records *yf::Zoom::Frontend::get_explain_records( } -Z_Records *yf::Zoom::Frontend::get_records(Package &package, +Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package, Odr_int start, Odr_int number_to_present, int *error, diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp index 02f197f..0deb96e 100644 --- a/src/metaproxy_prog.cpp +++ b/src/metaproxy_prog.cpp @@ -80,7 +80,9 @@ static void work_common(void *data) pack.router(*routerp).move(); /* this only exits if graceful stop is received (sig_usr1_handler) */ yaz_log(YLOG_LOG, "metaproxy stop"); +#if HAVE_UNISTD_H kill(-process_group, SIGTERM); /* kill all children processes as well */ +#endif _exit(0); }