summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-07-13 19:03:28 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-07-13 19:03:28 -0400
commitbeea7cdc2d003d815ef2ac32978f841b81288494 (patch)
tree2983697ff00cf58feccf24f95670064e403e0283 /indra/llcommon
parent0f665666201146069647d1686e2ff565d469097b (diff)
Attempt to fix confusing header-file-order problems on Windows.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 75b79467b7..6b96c0e234 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -25,6 +25,12 @@
* $/LicenseInfo$
*/
+#if !LL_WINDOWS
+#include <netinet/in.h>
+#include <errno.h>
+#include <sys/wait.h>
+#endif
+
#include "linden_common.h"
#include "../llsd.h"
#include "../llsdserialize.h"
@@ -37,9 +43,6 @@
#if LL_WINDOWS
#include <winsock2.h>
typedef U32 uint32_t;
-#else
-#include <netinet/in.h>
-#include <errno.h>
#endif
std::vector<U8> string_to_vector(const std::string& str)