From beea7cdc2d003d815ef2ac32978f841b81288494 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 13 Jul 2011 19:03:28 -0400
Subject: Attempt to fix confusing header-file-order problems on Windows.

---
 indra/llcommon/tests/llsdserialize_test.cpp | 9 ++++++---
 1 file 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)
-- 
cgit v1.2.3