From 7778010d76e6da534307ca3f0a3506d3d7f0ec5d Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 19:58:47 +0100 Subject: care taken of the fact that AI_NUMERICSERV is not defined on OSX 10.5 --- src/ip.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ip.cpp b/src/ip.cpp index 595689f..0fb2adf 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -239,7 +239,11 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_, // Restrict hostname/service to literals to avoid any DNS lookups or // service-name irregularity due to indeterminate socktype. - req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST; +#else + req.ai_flags = AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV; +#endif // Resolve the literal address. Some of the error info is lost in case // of error, however, there's no way to report EAI errors via errno. @@ -289,6 +293,11 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, // Avoid named services due to unclear socktype, and don't pick IPv6 // addresses if we don't have a local IPv6 address configured. req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#if defined ZMQ_HAVE_OSX + req.ai_flags = AI_ADDRCONFIG; +#else + req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; +#endif // Resolve host name. Some of the error info is lost in case of error, // however, there's no way to report EAI errors via errno. -- cgit v1.2.3 From 5041b0bc0bce43e5b6d8b6c6264141d33f3c2a7c Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 15 Feb 2010 20:35:00 +0100 Subject: fixing the previous commit :( --- src/ip.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/ip.cpp b/src/ip.cpp index 0fb2adf..822e359 100644 --- a/src/ip.cpp +++ b/src/ip.cpp @@ -292,7 +292,6 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, // Avoid named services due to unclear socktype, and don't pick IPv6 // addresses if we don't have a local IPv6 address configured. - req.ai_flags = AI_NUMERICSERV | AI_ADDRCONFIG; #if defined ZMQ_HAVE_OSX req.ai_flags = AI_ADDRCONFIG; #else -- cgit v1.2.3 From 80c820d758aa65d71fbf4a24fd59d11de1f72fa5 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 15 Feb 2010 23:51:05 +0100 Subject: Cleaning up more PGM cruft --- src/Makefile.am | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 0ff7bbf..446b1e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ include_HEADERS = ../bindings/c/zmq.h endif endif -if BUILD_PGM2 +if BUILD_PGM pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/time.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/if.c \ @@ -49,6 +49,12 @@ pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/sockaddr.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c + +../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py + python ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py > $@ + +../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_tables.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl + perl ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl > $@ endif nodist_libzmq_la_SOURCES = $(pgm_sources) @@ -171,9 +177,9 @@ libzmq_la_SOURCES = app_thread.hpp \ zmq_init.cpp \ zmq_listener.cpp -libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAFS@ +libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@ -if BUILD_PGM2 +if BUILD_PGM if ON_MINGW libpgm_diff_flags = \ -- cgit v1.2.3