generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-19 00:46:05 +01:00
Code Issues Projects Releases Wiki Activity

Problem: DRAFT build broken on old Windows

Browse Source 
Solution: define uint64_t if not available in the system headers and
remove inclusion of inttypes.h which does not exist and is already
conditionally included in zmq.h if required, do not use PRIx64
This commit is contained in:
Luca Boccassi 2019-02-03 21:09:05 +01:00
parent 84847138a1
commit a9a5b2bde5
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/zmq.h
View File

@ -98,6 +98,9 @@ extern "C" {
#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
#include <inttypes.h>
#elif defined _MSC_VER && _MSC_VER < 1600
#ifndef uint64_t
typedef unsigned __int64 uint64_t;
#endif
#ifndef int32_t
typedef __int32 int32_t;
#endif

11
tests/testutil_monitoring.hpp
View File

@ -32,9 +32,6 @@
#include "testutil.hpp"
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
// General, i.e. non-security specific, monitor utilities
// Read one event off the monitor socket; return value and address
@ -261,7 +258,7 @@ int64_t get_monitor_event_with_timeout_v2 (void *monitor_,
char **remote_address_,
int timeout_)
{
int res;
int64_t res;
if (timeout_ == -1) {
// process infinite timeout in small steps to allow the user
// to see some information on the console
@ -309,10 +306,8 @@ void expect_monitor_event_v2 (void *monitor_,
expected_remote_address_ ? &remote_address : NULL);
bool failed = false;
if (event != expected_event_) {
fprintf (stderr,
"Expected monitor event %" PRIx64 ", but received %" PRIx64
"\n",
expected_event_, event);
fprintf (stderr, "Expected monitor event %lld, but received %lld\n",
(long long) expected_event_, (long long) event);
failed = true;
}
if (expected_local_address_