generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-07 14:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Different fixed to make OpenVMS port work.

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Brett Cameron 2011-03-08 14:39:52 +01:00 committed by Martin Sustrik
parent 184bdb8e2b
commit b00be2651c
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -8,6 +8,7 @@ Bernd Prager <bernd@prager.ws>
Bernd Melchers <melchers@ZEDAT.FU-Berlin.DE> Bernd Melchers <melchers@ZEDAT.FU-Berlin.DE>
Bob Beaty <rbeaty@peak6.com> Bob Beaty <rbeaty@peak6.com>
Brian Buchanan <bwb@holo.org> Brian Buchanan <bwb@holo.org>
Brett Cameron <Brett.Cameron@hp.com>
Burak Arslan <burak-github@arskom.com.tr> Burak Arslan <burak-github@arskom.com.tr>
Chia-liang Kao <clkao@clkao.org> Chia-liang Kao <clkao@clkao.org>
Chris Rempel <csrl@gmx.com> Chris Rempel <csrl@gmx.com>
@ -70,7 +71,6 @@ Alessio Spadaro <alessio.spadaro@finservice.com>
Alexander Majorov <alexander.majorov@intel.com> Alexander Majorov <alexander.majorov@intel.com>
Anh Vu <vietanh.vu@m4x.org> Anh Vu <vietanh.vu@m4x.org>
Bernd Schumacher <bernd.schumacher@hp.com> Bernd Schumacher <bernd.schumacher@hp.com>
Brett Cameron <Brett.Cameron@hp.com>
Brian Granger <ellisonbg.net@gmail.com> Brian Granger <ellisonbg.net@gmail.com>
Carsten Dinkelmann <din@foobar-cpa.de> Carsten Dinkelmann <din@foobar-cpa.de>
David Bahi <dbahi@novell.com> David Bahi <dbahi@novell.com>

16
src/ip.cpp
View File

@ -229,10 +229,13 @@ int zmq::resolve_ip_interface (sockaddr_storage* addr_, socklen_t *addr_len_,
} }
// There's no such interface name. Assume literal address. // There's no such interface name. Assume literal address.
#if defined ZMQ_HAVE_OPENVMS && defined __ia64
__addrinfo64 *res = NULL;
__addrinfo64 req;
#else
addrinfo *res = NULL; addrinfo *res = NULL;
// Set up the query.
addrinfo req; addrinfo req;
#endif
memset (&req, 0, sizeof (req)); memset (&req, 0, sizeof (req));
// We only support IPv4 addresses for now. // We only support IPv4 addresses for now.
@ -312,11 +315,13 @@ int zmq::resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_,
return 0; return 0;
} }
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
int zmq::resolve_local_path (sockaddr_storage *addr_, socklen_t *addr_len_, int zmq::resolve_local_path (sockaddr_storage *addr_, socklen_t *addr_len_,
const char *path_) const char *path_)
{ {
#if defined ZMQ_HAVE_WINDOWS || defined ZMQ_HAVE_OPENVMS
errno = EPROTONOSUPPORT;
return -1;
#else
sockaddr_un *un = (sockaddr_un*) addr_; sockaddr_un *un = (sockaddr_un*) addr_;
if (strlen (path_) >= sizeof (un->sun_path)) if (strlen (path_) >= sizeof (un->sun_path))
{ {
@ -327,7 +332,6 @@ int zmq::resolve_local_path (sockaddr_storage *addr_, socklen_t *addr_len_,
un->sun_family = AF_UNIX; un->sun_family = AF_UNIX;
*addr_len_ = sizeof (sockaddr_un); *addr_len_ = sizeof (sockaddr_un);
return 0; return 0;
#endif
} }
#endif

2
src/ip.hpp
View File

@ -60,11 +60,9 @@ namespace zmq
int resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_, int resolve_ip_hostname (sockaddr_storage *addr_, socklen_t *addr_len_,
const char *hostname_); const char *hostname_);
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
// This function sets up address for UNIX domain transport. // This function sets up address for UNIX domain transport.
int resolve_local_path (sockaddr_storage *addr_, socklen_t *addr_len_, int resolve_local_path (sockaddr_storage *addr_, socklen_t *addr_len_,
const char* pathname_); const char* pathname_);
#endif
} }
#endif #endif

2
src/semaphore.hpp
View File

@ -26,6 +26,8 @@
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp" #include "windows.hpp"
#elif defined ZMQ_HAVE_OPENVMS
#include <pthread.h>
#else #else
#include <semaphore.h> #include <semaphore.h>
#endif #endif

10
src/stdint.hpp
View File

@ -23,7 +23,7 @@
#include "platform.hpp" #include "platform.hpp"
#ifdef ZMQ_HAVE_SOLARIS #if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
#include <inttypes.h> #include <inttypes.h>
@ -54,14 +54,6 @@ typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
#endif #endif
#elif defined ZMQ_HAVE_OPENVMS
#include <types.h>
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
#else #else
#include <stdint.h> #include <stdint.h>