diff options
| author | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
| commit | 1b0e3d68183fb63ac5c160bc9aa7956746f33faf (patch) | |
| tree | 260f0972726dc9d8957486f2e03773dac4a10afc /indra/llcommon/lluuid.cpp | |
| parent | 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/llcommon/lluuid.cpp')
| -rw-r--r-- | indra/llcommon/lluuid.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp index b05630c6b5..e3b293e465 100644 --- a/indra/llcommon/lluuid.cpp +++ b/indra/llcommon/lluuid.cpp @@ -601,9 +601,7 @@ S32 LLUUID::getNodeID(unsigned char *node_id) #define HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#if LL_SOLARIS -#include <sys/sockio.h> -#elif !LL_DARWIN +#if !LL_DARWIN #include <linux/sockios.h> #endif #endif |