Skip to content

Commit

Permalink
Problem: The defines for optional dependencies are based on the library
Browse files Browse the repository at this point in the history
name and due to changes in zproject won't get a 'LIB' prepended.
Solution: Remove the prepended 'LIB' when checking for the library uuid.
  • Loading branch information
sappo committed Sep 29, 2015
1 parent 392e6b3 commit 639f2ce
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion builds/msvc/platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@

#define CZMQ_HAVE_WINDOWS

#define HAVE_LIBUUID 1
#define HAVE_UUID 1

#endif
12 changes: 6 additions & 6 deletions include/czmq_prelude.h
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ typedef struct sockaddr_in inaddr_t; // Internet socket address structure
typedef __int16 int16_t;
typedef __int32 int32_t;
typedef __int64 int64_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
Expand Down Expand Up @@ -583,13 +583,13 @@ typedef int SOCKET;
# endif
#endif

#if defined (__WINDOWS__) && !defined (HAVE_LIBUUID)
# define HAVE_LIBUUID 1
#if defined (__WINDOWS__) && !defined (HAVE_UUID)
# define HAVE_UUID 1
#endif
#if defined (__UTYPE_OSX) && !defined (HAVE_LIBUUID)
# define HAVE_LIBUUID 1
#if defined (__UTYPE_OSX) && !defined (HAVE_UUID)
# define HAVE_UUID 1
#endif
#if defined (HAVE_LIBUUID)
#if defined (HAVE_UUID)
# if defined (__UTYPE_FREEBSD) || defined (__UTYPE_NETBSD)
# include <uuid.h>
# elif defined __UTYPE_HPUX
Expand Down
2 changes: 1 addition & 1 deletion src/zuuid.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ zuuid_new (void)
{
zuuid_t *self = (zuuid_t *) zmalloc (sizeof (zuuid_t));
if (self) {
#if defined (HAVE_LIBUUID)
#if defined (HAVE_UUID)
# if defined (__WINDOWS__)
UUID uuid;
assert (sizeof (uuid) == ZUUID_LEN);
Expand Down

0 comments on commit 639f2ce

Please sign in to comment.