[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/lib/Crypto...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       14/03/10 16:33:21

Modified files:
        distrib        : ChangeLog 
        src/utils/lib  : CryptoPP.h 

Log message:
        patch #8351

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1597&r2=1.1598
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP.h?cvsroot=mldonkey&r1=1.11&r2=1.12

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1597
retrieving revision 1.1598
diff -u -b -r1.1597 -r1.1598
--- distrib/ChangeLog   10 Mar 2014 16:31:27 -0000      1.1597
+++ distrib/ChangeLog   10 Mar 2014 16:33:21 -0000      1.1598
@@ -15,6 +15,7 @@
 =========
 
 2014/03/10:
+8351: CryptoPP: Fix FreeBSD build with clang on i386 (tijl)
 8350: CryptoPP: Fix compilation on armhf (ygrek)
 
 2014/02/23:

Index: src/utils/lib/CryptoPP.h
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/utils/lib/CryptoPP.h    4 Apr 2012 20:20:54 -0000       1.11
+++ src/utils/lib/CryptoPP.h    10 Mar 2014 16:33:21 -0000      1.12
@@ -274,7 +274,7 @@
 // CodeWarrior defines _MSC_VER
 #if !defined(CRYPTOPP_DISABLE_X86ASM) && ((defined(_MSC_VER) && 
!defined(__MWERKS__) && defined(_M_IX86)) || (defined(__GNUC__) && 
defined(__i386__)))
        // The x86 version of MacOSX fails when asm is enabled.
-       #if !defined(__i386__) || !defined(__APPLE__)
+       #if !defined(__APPLE__) && !defined(__clang__)
                #define CRYPTOPP_X86ASM_AVAILABLE
        #endif
 #endif