From 014b66b2f4a1f55e227182c2fbb494186f3286f7 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 18 Aug 2001 10:22:10 +0000
Subject: [PATCH] Removed non-functioning msvc link command from Jamfile, added
 user32.lib forced link to w32_regex_traits.cpp

[SVN r10886]
---
 example/Jamfile          | 3 +--
 src/w32_regex_traits.cpp | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/example/Jamfile b/example/Jamfile
index 36ac8ccf..11fc8177 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -1,13 +1,11 @@
 subproject libs/regex/example ;
 
-NOCARE user32.lib ;
 
 exe timer : timer/regex_timer.cpp 
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
 		<include>$(BOOST_ROOT)
 		<define>BOOST_RE_NO_LIB=1
-		<msvc><*><find-library>user32.lib
 	: 
 		debug
       <runtime-link>dynamic
@@ -146,3 +144,4 @@ exe regex_split_example_2 : snippets/regex_split_example_2.cpp
 
 
 
+
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index 17857e74..0f5e1a0d 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -32,6 +32,13 @@
 
 #if defined(_WIN32) && !defined(BOOST_RE_NO_W32)
 
+//
+// VC6 needs to link to user32.lib:
+//
+#ifdef BOOST_MSVC
+#pragma comment(lib, "user32.lib")
+#endif
+
 namespace{
 
 //