From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 4 Jan 2007 02:04:29 +0000
Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431

This turned up the following "lost" changes:

	llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
	llfontgl.cpp (from maintenance r50207) - whitespace only
	inventorybridge.cpp (property - non-executable)
	skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
---
 indra/llcommon/llsys.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'indra/llcommon/llsys.cpp')

diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 9c54ddaac1..b50c0a13ce 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -8,15 +8,21 @@
 
 #include "linden_common.h"
 
+#include "llsys.h"
+
 #include <iostream>
 #include <zlib/zlib.h>
 #include "processor.h"
 
-#if LL_DARWIN
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
+#if LL_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>
+#	include <windows.h>
+#elif LL_DARWIN
+#	include <sys/sysctl.h>
+#	include <sys/utsname.h>
 #elif LL_LINUX
-#include <sys/utsname.h>
+#	include <sys/utsname.h>
 const char MEMINFO_FILE[] = "/proc/meminfo";
 const char CPUINFO_FILE[] = "/proc/cpuinfo";
 #endif
-- 
cgit v1.2.3