[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57835] trunk/lib/windows_vc11/openimageio : VS 2012 x86 libs maintenance:

[Juergen Herrmann]

Revision: 57835
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57835
Author:   shadowrom
Date:     2013-06-27 19:50:57 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
VS 2012 x86 libs maintenance:

- Fix for own error, OpenImageIO.lib supports windows xp now ;)

Modified Paths:
--------------
    trunk/lib/windows_vc11/openimageio/include/OpenImageIO/thread.h
    trunk/lib/windows_vc11/openimageio/lib/OpenImageIO.lib
    trunk/lib/windows_vc11/openimageio/lib/OpenImageIO_d.lib
    trunk/lib/windows_vc11/openimageio/lib/openimageio.pdb

Modified: trunk/lib/windows_vc11/openimageio/include/OpenImageIO/thread.h
===================================================================
--- trunk/lib/windows_vc11/openimageio/include/OpenImageIO/thread.h	2013-06-27 18:44:55 UTC (rev 57834)
+++ trunk/lib/windows_vc11/openimageio/include/OpenImageIO/thread.h	2013-06-27 19:50:57 UTC (rev 57835)
@@ -220,18 +220,8 @@
 
 #endif
 
-inline LONGLONG _InterlockedCompareExchange64(LONGLONG volatile* Destination, LONGLONG Exchange, LONGLONG Comperand)
-{
-	__asm {
-		mov esi, [Destination]
-		mov ebx, dword ptr [Exchange]
-		mov ecx, dword ptr [Exchange + 4]
-		mov eax, dword ptr [Comperand]
-		mov edx, dword ptr [Comperand + 4]
-		lock cmpxchg8b [esi]
-	}
-}
 
+
 /// Atomic version of:  r = *at, *at += x, return r
 /// For each of several architectures.
 inline int
@@ -265,10 +255,7 @@
 #  if defined(_WIN64)
     return _InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
 #  else
-    LONGLONG Old;
-	do Old = *at;
-	while (_InterlockedCompareExchange64(at, Old + x, Old) != Old);
-	return Old;
+    return InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
 #  endif
 #else
 #   error No atomics on this platform.

Modified: trunk/lib/windows_vc11/openimageio/lib/OpenImageIO.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc11/openimageio/lib/OpenImageIO_d.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc11/openimageio/lib/openimageio.pdb
===================================================================
(Binary files differ)