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/lltimer.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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

diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index bd054f02d8..a8118258f9 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -8,15 +8,19 @@
 
 #include "linden_common.h"
 
+#include "lltimer.h"
 
-#if LL_WINDOWS
-#include <time.h>
+#include "u64.h"
 
+#if LL_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>
+#	include <windows.h>
+#	include <time.h>
 #elif LL_LINUX
-#include <time.h>
-#include <sys/time.h>
-#include <sched.h>
-
+#	include <time.h>
+#	include <sys/time.h>
+#	include <sched.h>
 #elif LL_DARWIN
 #	include <time.h>
 #	include <sys/time.h>
@@ -25,9 +29,6 @@
 #endif
 
 
-#include "lltimer.h"
-#include "u64.h"
-
 //
 // Locally used constants
 //
-- 
cgit v1.2.3