diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-07-13 19:41:23 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-07-13 19:41:23 -0400 |
| commit | ec780a733f46e2fc436ca5d492f42ab4e3e8b516 (patch) | |
| tree | 76f7c5150e818fe409aa6637a7762d10f51949c2 /indra/llcommon/tests | |
| parent | beea7cdc2d003d815ef2ac32978f841b81288494 (diff) | |
Still trying to fix Windows header-file-order problem.
Diffstat (limited to 'indra/llcommon/tests')
| -rw-r--r-- | indra/llcommon/tests/llsdserialize_test.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index 6b96c0e234..ff0d8d5f46 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()); |