Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Problem: debian-kfreebsd build broken #1907

Merged
merged 1 commit into from
Apr 29, 2018
Merged

Problem: debian-kfreebsd build broken #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions include/czmq_prelude.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,10 +695,7 @@ char *if_indextoname (unsigned int ifindex, char *ifname);
#if defined (__UTYPE_OSX) && !defined (HAVE_UUID)
# define HAVE_UUID 1
#endif
#if defined (__UTYPE_FREEBSD) && !defined (HAVE_UUID)
# define HAVE_UUID 1
#endif
#if defined (HAVE_UUID)
#if defined (HAVE_UUID) || defined (__UTYPE_FREEBSD)
# if defined (__UTYPE_FREEBSD) || defined (__UTYPE_NETBSD) || defined(__UTYPE_OPENBSD)
# include <uuid.h>
# elif defined __UTYPE_HPUX
Expand Down
2 changes: 1 addition & 1 deletion src/zuuid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ zuuid_new (void)
assert (sizeof (uuid) == ZUUID_LEN);
UuidCreate (&uuid);
zuuid_set (self, (byte *) &uuid);
#elif defined (HAVE_UUID) && !defined (__UTYPE_FREEBSD)
#elif defined (HAVE_UUID)
uuid_t uuid;
assert (sizeof (uuid) == ZUUID_LEN);
uuid_generate (uuid);
Expand Down