From ec780a733f46e2fc436ca5d492f42ab4e3e8b516 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 13 Jul 2011 19:41:23 -0400
Subject: [PATCH] Still trying to fix Windows header-file-order problem.
---
indra/llcommon/tests/llsdserialize_test.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 6b96c0e2343..ff0d8d5f466 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -25,13 +25,18 @@
* $/LicenseInfo$
*/
-#if !LL_WINDOWS
+
+#include "linden_common.h"
+
+#if LL_WINDOWS
+#include <winsock2.h>
+typedef U32 uint32_t;
+#else
#include <netinet/in.h>
#include <errno.h>
#include <sys/wait.h>
#endif
-#include "linden_common.h"
#include "../llsd.h"
#include "../llsdserialize.h"
#include "../llformat.h"
@@ -40,11 +45,6 @@
#include "llprocesslauncher.h"
#include "stringize.h"
-#if LL_WINDOWS
-#include <winsock2.h>
-typedef U32 uint32_t;
-#endif
-
std::vector<U8> string_to_vector(const std::string& str)
{
return std::vector<U8>(str.begin(), str.end());
--
GitLab