diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-02-19 15:25:05 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-02-19 15:25:05 +0100 |
| commit | aff1f6621ae13083c7f15f7f1f808560254a2dcb (patch) | |
| tree | 9e73dd8bd5d38a21e0aa83b4d4bea55b7792b39e /src/uuid.hpp | |
| parent | 75f571c8844231f4172f131e1dd6ba2348eb54e5 (diff) | |
| parent | 2a79a943de417679c562cd4a917e1d1bc19b0d25 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src/uuid.hpp')
| -rw-r--r-- | src/uuid.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uuid.hpp b/src/uuid.hpp index f565f8d..03bb69d 100644 --- a/src/uuid.hpp +++ b/src/uuid.hpp @@ -23,7 +23,7 @@ #include "platform.hpp" #include "stdint.hpp" -#if defined ZMQ_HAVE_FREEBSD +#if defined ZMQ_HAVE_FREEBSD || defined ZMQ_HAVE_NETBSD #include <uuid.h> #elif defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OSX #include <uuid/uuid.h> @@ -60,7 +60,7 @@ namespace zmq #endif ::UUID uuid; RPC_CSTR uuid_str; -#elif defined ZMQ_HAVE_FREEBSD +#elif defined ZMQ_HAVE_FREEBSD || defined ZMQ_HAVE_NETBSD ::uuid_t uuid; char *uuid_str; #elif defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OSX |