bzr commit into mysql-6.0-falcon branch (vvaintroub:2806)

[Vladislav Vaintroub]

#At file:///C:/bzr/mysql-6.0-falcon-team/

 2806 Vladislav Vaintroub	2008-08-29
      Fix build error - generic-msvc.h does not compile in C++.
      The error occurs only when using Visual Studio 2005 
      together with Windows SDK 6.0 and 6.1. The cause of the 
      error is the  conflicting definition for some atomic 
      intrinsics in winnt.h and  intrin.h, as reported on
      https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=262047
      
      The fix is not to include <intrin.h> for VS2005
      but declare intinsics the same way as we do for 
      VS2003.
modified:
  include/atomic/generic-msvc.h

=== modified file 'include/atomic/generic-msvc.h'
--- a/include/atomic/generic-msvc.h	2008-07-10 11:37:06 +0000
+++ b/include/atomic/generic-msvc.h	2008-08-29 17:38:04 +0000
@@ -30,7 +30,7 @@
 */
 #ifdef _M_IX86
 
-#if (_MSC_VER >= 1400)
+#if (_MSC_VER >= 1500)
 #include <intrin.h>
 #else
 C_MODE_START