From 16453005bb8373d7228262bf79c5882f311380e9 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Thu, 6 Jun 2019 01:51:38 -0700
Subject: [DRTVWR-476] - update cef, fix merge

---
 indra/llcommon/llfasttimer.h                        | 6 ++++++
 indra/llmessage/llcoproceduremanager.cpp            | 2 ++
 indra/llmessage/tests/llcoproceduremanager_test.cpp | 2 ++
 3 files changed, 10 insertions(+)

(limited to 'indra')

diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index d463fc9d65..5628a05b00 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -31,6 +31,10 @@
 #include "lltrace.h"
 #include "lltreeiterators.h"
 
+#if LL_WINDOWS
+#include <intrin.h>
+#endif
+
 #define LL_FAST_TIMER_ON 1
 #define LL_FASTTIMER_USE_RDTSC 1
 
@@ -85,6 +89,8 @@ public:
 	//	return __rdtsc();
 	//}
 
+	
+
 	// shift off lower 8 bits for lower resolution but longer term timing
 	// on 1Ghz machine, a 32-bit word will hold ~1000 seconds of timing
 #if LL_FASTTIMER_USE_RDTSC
diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index 579ab097e0..fa8e9c3ebf 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -25,6 +25,8 @@
 * $/LicenseInfo$
 */
 
+#include "llwin32headers.h"
+
 #include "linden_common.h"
 
 #include "llcoproceduremanager.h"
diff --git a/indra/llmessage/tests/llcoproceduremanager_test.cpp b/indra/llmessage/tests/llcoproceduremanager_test.cpp
index 17535abd1e..9b0ef93b13 100644
--- a/indra/llmessage/tests/llcoproceduremanager_test.cpp
+++ b/indra/llmessage/tests/llcoproceduremanager_test.cpp
@@ -26,6 +26,8 @@
  * $/LicenseInfo$
  */
 
+#include "llwin32headers.h"
+
 #include "linden_common.h"
 #include "llsdserialize.h"
 
-- 
cgit v1.2.3