diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 11:36:50 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 11:36:50 -0400 |
commit | 8bcff54654f9ec98d166dabd38180be63dc8837c (patch) | |
tree | 65d1744531195f7ec3bd8eee000928dcd8ca62a9 /indra/llcommon/lluuid.cpp | |
parent | 4af7cd51e9cc22d9dc2fe42e378051c55515ac8e (diff) | |
parent | db013ab0cb7dafb964b149a36b6963770f7427e5 (diff) |
Merge remote branch 'develop'into release/luau-scripting
Diffstat (limited to 'indra/llcommon/lluuid.cpp')
-rw-r--r-- | indra/llcommon/lluuid.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp index 7aeabc3c4a..b9bd27aa17 100644 --- a/indra/llcommon/lluuid.cpp +++ b/indra/llcommon/lluuid.cpp @@ -25,11 +25,8 @@ #include "linden_common.h" - // We can't use WIN32_LEAN_AND_MEAN here, needs lots of includes. #if LL_WINDOWS #include "llwin32headers.h" -// ugh, this is ugly. We need to straighten out our linking for this library -#pragma comment(lib, "IPHLPAPI.lib") #include <iphlpapi.h> #include <nb30.h> #endif |