From 00cd7d49c7f2b532b2349581b82577bc714f9bf8 Mon Sep 17 00:00:00 2001 From: Steven McCoy Date: Tue, 28 Sep 2010 16:35:29 +0200 Subject: Upgrade to OpenPGM-5.0.78 --- src/zmq.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/zmq.cpp') diff --git a/src/zmq.cpp b/src/zmq.cpp index 3f1d88b..5b59802 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -242,20 +242,20 @@ void *zmq_init (int io_threads_) // protocol ID. Note that if you want to use gettimeofday and sleep for // openPGM timing, set environment variables PGM_TIMER to "GTOD" and // PGM_SLEEP to "USLEEP". - GError *pgm_error = NULL; - int rc = pgm_init (&pgm_error); + pgm_error_t *pgm_error = NULL; + bool rc = pgm_init (&pgm_error); if (rc != TRUE) { - if (pgm_error->domain == PGM_IF_ERROR && ( - pgm_error->code == PGM_IF_ERROR_INVAL || - pgm_error->code == PGM_IF_ERROR_XDEV || - pgm_error->code == PGM_IF_ERROR_NODEV || - pgm_error->code == PGM_IF_ERROR_NOTUNIQ || - pgm_error->code == PGM_IF_ERROR_ADDRFAMILY || - pgm_error->code == PGM_IF_ERROR_FAMILY || - pgm_error->code == PGM_IF_ERROR_NODATA || - pgm_error->code == PGM_IF_ERROR_NONAME || - pgm_error->code == PGM_IF_ERROR_SERVICE)) { - g_error_free (pgm_error); + if (pgm_error->domain == PGM_ERROR_DOMAIN_IF && ( + pgm_error->code == PGM_ERROR_INVAL || + pgm_error->code == PGM_ERROR_XDEV || + pgm_error->code == PGM_ERROR_NODEV || + pgm_error->code == PGM_ERROR_NOTUNIQ || + pgm_error->code == PGM_ERROR_ADDRFAMILY || + pgm_error->code == PGM_ERROR_AFNOSUPPORT || + pgm_error->code == PGM_ERROR_NODATA || + pgm_error->code == PGM_ERROR_NONAME || + pgm_error->code == PGM_ERROR_SERVICE)) { + pgm_error_free (pgm_error); errno = EINVAL; return NULL; } -- cgit v1.2.3