czmq-ffi-gen 0.12.0-x64-mingw32 → 0.13.0-x64-mingw32

data/lib/czmq-ffi-gen/czmq/ffi.rb

@@ -1015,10 +1015,6 @@ module CZMQ
       attach_function :zsock_set_ipv6, [:pointer, :int], :void, **opts
       attach_function :zsock_immediate, [:pointer], :int, **opts
       attach_function :zsock_set_immediate, [:pointer, :int], :void, **opts
-      attach_function :zsock_set_router_raw, [:pointer, :int], :void, **opts
-      attach_function :zsock_ipv4only, [:pointer], :int, **opts
-      attach_function :zsock_set_ipv4only, [:pointer, :int], :void, **opts
-      attach_function :zsock_set_delay_attach_on_connect, [:pointer, :int], :void, **opts
       attach_function :zsock_type, [:pointer], :int, **opts
       attach_function :zsock_sndhwm, [:pointer], :int, **opts
       attach_function :zsock_set_sndhwm, [:pointer, :int], :void, **opts
@@ -1066,9 +1062,13 @@ module CZMQ
       attach_function :zsock_tcp_accept_filter, [:pointer], :pointer, **opts
       attach_function :zsock_set_tcp_accept_filter, [:pointer, :string], :void, **opts
       attach_function :zsock_rcvmore, [:pointer], :int, **opts
-      attach_function :zsock_fd, [:pointer], (::FFI::Platform.unix? ? :int : :uint64_t), **opts
+      attach_function :zsock_fd, [:pointer], (::FFI::Platform.unix? ? :int : :uint64), **opts
       attach_function :zsock_events, [:pointer], :int, **opts
       attach_function :zsock_last_endpoint, [:pointer], :pointer, **opts
+      attach_function :zsock_set_router_raw, [:pointer, :int], :void, **opts
+      attach_function :zsock_ipv4only, [:pointer], :int, **opts
+      attach_function :zsock_set_ipv4only, [:pointer, :int], :void, **opts
+      attach_function :zsock_set_delay_attach_on_connect, [:pointer, :int], :void, **opts
       attach_function :zsock_test, [:bool], :void, **opts
 
       require_relative 'ffi/zsock'

data/lib/czmq-ffi-gen/gem_version.rb

@@ -1,5 +1,5 @@
 module CZMQ
   module FFI
-    GEM_VERSION = "0.12.0"
+    GEM_VERSION = "0.13.0"
   end
 end

data/vendor/local/include/czmq_library.h

@@ -28,7 +28,7 @@
 //  CZMQ version macros for compile-time API detection
 #define CZMQ_VERSION_MAJOR 4
 #define CZMQ_VERSION_MINOR 0
-#define CZMQ_VERSION_PATCH 0
+#define CZMQ_VERSION_PATCH 3
 
 #define CZMQ_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))
@@ -49,8 +49,14 @@
 #   else
 #       define CZMQ_EXPORT __declspec(dllimport)
 #   endif
+#   define CZMQ_PRIVATE
 #else
 #   define CZMQ_EXPORT
+#   if (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#       define CZMQ_PRIVATE __attribute__ ((visibility ("hidden")))
+#   else
+#       define CZMQ_PRIVATE
+#   endif
 #endif
 
 //  Opaque class structures to allow forward references

data/vendor/local/include/czmq_prelude.h

@@ -193,7 +193,7 @@
 #elif (defined (sinix))
 #   define __UTYPE_SINIX
 #   define __UNIX__
-#elif (defined (SOLARIS) || defined (__SRV4))
+#elif (defined (SOLARIS) || defined (__SVR4)) || defined (SVR4)
 #   define __UTYPE_SUNSOLARIS
 #   define __UNIX__
 #elif (defined (SUNOS) || defined (SUN) || defined (sun))
@@ -421,11 +421,17 @@ typedef struct {
 #define strneq(s1,s2)   (strcmp ((s1), (s2)))
 
 //  Provide random number from 0..(num-1)
+//  Note that (at least in Solaris) while rand() returns an int limited by
+//  RAND_MAX, random() returns a 32-bit value all filled with random bits.
 #if (defined (__WINDOWS__)) || (defined (__UTYPE_IBMAIX)) \
- || (defined (__UTYPE_HPUX)) || (defined (__UTYPE_SUNOS))
+ || (defined (__UTYPE_HPUX)) || (defined (__UTYPE_SUNOS)) || (defined (__UTYPE_SOLARIS))
 #   define randof(num)  (int) ((float) (num) * rand () / (RAND_MAX + 1.0))
 #else
-#   define randof(num)  (int) ((float) (num) * random () / (RAND_MAX + 1.0))
+# if defined(RAND_MAX)
+#   define randof(num)  (int) ((float) (num) * (random () % RAND_MAX) / (RAND_MAX + 1.0))
+# else
+#   define randof(num)  (int) ((float) (num) * (uint32_t)random () / (UINT32_MAX + 1.0))
+# endif
 #endif
 
 // Windows MSVS doesn't have stdbool

data/vendor/local/include/zhash.h

@@ -164,7 +164,8 @@ CZMQ_EXPORT int
 CZMQ_EXPORT int
     zhash_refresh (zhash_t *self);
 
-//  Set hash for automatic value destruction
+//  Set hash for automatic value destruction. Note that this assumes that
+//  values are NULL-terminated strings. Do not use with different types. 
 CZMQ_EXPORT void
     zhash_autofree (zhash_t *self);
 

data/vendor/local/include/zhashx.h

@@ -38,11 +38,11 @@ typedef void * (zhashx_duplicator_fn) (
 typedef int (zhashx_comparator_fn) (
     const void *item1, const void *item2);
 
-// compare two items, for sorting
+// Destroy an item.
 typedef void (zhashx_free_fn) (
     void *data);
 
-// compare two items, for sorting
+// Hash function for keys.
 typedef size_t (zhashx_hash_fn) (
     const void *key);
 

data/vendor/local/include/zmq.h

@@ -41,7 +41,7 @@
 /*  Version macros for compile-time API version detection                     */
 #define ZMQ_VERSION_MAJOR 4
 #define ZMQ_VERSION_MINOR 2
-#define ZMQ_VERSION_PATCH 0
+#define ZMQ_VERSION_PATCH 2
 
 #define ZMQ_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))
@@ -112,6 +112,13 @@ extern "C" {
 #   include <stdint.h>
 #endif
 
+//  32-bit AIX's pollfd struct members are called reqevents and rtnevents so it
+//  defines compatibility macros for them. Need to include that header first to
+//  stop build failures since zmq_pollset_t defines them as events and revents.
+#ifdef ZMQ_HAVE_AIX
+    #include <poll.h>
+#endif
+
 
 /******************************************************************************/
 /*  0MQ errors.                                                               */
@@ -229,10 +236,23 @@ ZMQ_EXPORT int zmq_ctx_destroy (void *context);
 /*  0MQ message definition.                                                   */
 /******************************************************************************/
 
-/* union here ensures correct alignment on architectures that require it, e.g.
- * SPARC
+/* Some architectures, like sparc64 and some variants of aarch64, enforce pointer
+ * alignment and raise sigbus on violations. Make sure applications allocate
+ * zmq_msg_t on addresses aligned on a pointer-size boundary to avoid this issue.
  */
-typedef union zmq_msg_t {unsigned char _ [64]; void *p; } zmq_msg_t;
+typedef struct zmq_msg_t {
+#if defined (__GNUC__) || defined ( __INTEL_COMPILER) || \
+        (defined (__SUNPRO_C) && __SUNPRO_C >= 0x590) || \
+        (defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
+    unsigned char _ [64] __attribute__ ((aligned (sizeof (void *))));
+#elif defined (_MSC_VER) && (defined (_M_X64) || defined (_M_ARM64))
+    __declspec (align (8)) unsigned char _ [64];
+#elif defined (_MSC_VER) && (defined (_M_IX86) || defined (_M_ARM_ARMV7VE))
+    __declspec (align (4)) unsigned char _ [64];
+#else
+    unsigned char _ [64];
+#endif
+} zmq_msg_t;
 
 typedef void (zmq_free_fn) (void *data, void *hint);
 
@@ -330,8 +350,6 @@ ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
 #define ZMQ_HANDSHAKE_IVL 66
 #define ZMQ_SOCKS_PROXY 68
 #define ZMQ_XPUB_NODROP 69
-//  All options after this is for version 4.2 and still *draft*
-//  Subject to arbitrary change without notice
 #define ZMQ_BLOCKY 70
 #define ZMQ_XPUB_MANUAL 71
 #define ZMQ_XPUB_WELCOME_MSG 72
@@ -543,6 +561,13 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 #define ZMQ_SCATTER 17
 #define ZMQ_DGRAM 18
 
+/*  DRAFT 0MQ socket events and monitoring                                    */
+#define ZMQ_EVENT_HANDSHAKE_FAILED  0x0800
+#define ZMQ_EVENT_HANDSHAKE_SUCCEED 0x1000
+
+/*  DRAFT Context options                                                     */
+#define ZMQ_MSG_T_SIZE 6
+
 /*  DRAFT Socket methods.                                                     */
 ZMQ_EXPORT int zmq_join (void *s, const char *group);
 ZMQ_EXPORT int zmq_leave (void *s, const char *group);
@@ -577,6 +602,7 @@ ZMQ_EXPORT int  zmq_poller_add (void *poller, void *socket, void *user_data, sho
 ZMQ_EXPORT int  zmq_poller_modify (void *poller, void *socket, short events);
 ZMQ_EXPORT int  zmq_poller_remove (void *poller, void *socket);
 ZMQ_EXPORT int  zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
+ZMQ_EXPORT int  zmq_poller_wait_all (void *poller, zmq_poller_event_t *events, int n_events, long timeout);
 
 #if defined _WIN32
 ZMQ_EXPORT int zmq_poller_add_fd (void *poller, SOCKET fd, void *user_data, short events);