From 70aaa3e444cf9cb067addcbdde237762bd62fcf4 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 4 May 2007 21:57:06 +0000
Subject: svn merge -r 61148:61343
 svn+ssh://svn/svn/linden/branches/maintenance into release

---
 indra/llwindow/llwindowwin32.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llwindow')

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index a589bf29f9..e6bce27ce2 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -34,8 +34,12 @@
 #include "indra_constants.h"
 
 // culled from winuser.h
+#ifndef WM_MOUSEWHEEL /* Added to be compatible with later SDK's */
 const S32	WM_MOUSEWHEEL = 0x020A;
+#endif
+#ifndef WHEEL_DELTA /* Added to be compatible with later SDK's */
 const S32	WHEEL_DELTA = 120;     /* Value for rolling one detent */
+#endif
 const S32	MAX_MESSAGE_PER_UPDATE = 20;
 const S32	BITS_PER_PIXEL = 32;
 const S32	MAX_NUM_RESOLUTIONS = 32;
-- 
cgit v1.2.3