fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-05 17:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into c++11

Browse Source 
Conflicts:
	src/command_network.cc
This commit is contained in:
Jari Sundell
2011-12-07 16:08:05 +09:00
parent 9a9dcb88f7 0b05196e32
commit 41d49b7c18
9 changed files with 572 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/common.m4
+2 -2
View File
@@ -212,11 +212,11 @@ dnl AC_DEFINE(lt_cacheline_aligned, __cacheline_aligned, LibTorrent defined
dnl Need to fix this so that it uses the stuff defined by the system.
AC_DEFINE(LT_SMP_CACHE_BYTES, 128, Largest L1 cache size we know of, should work on all archs.)
AC_DEFINE(LT_SMP_CACHE_BYTES, 128, Largest L1 cache size we know of should work on all archs.)
AC_DEFINE(lt_cacheline_aligned, __attribute__((__aligned__(LT_SMP_CACHE_BYTES))), LibTorrent defined cacheline aligned.)
], [
AC_MSG_RESULT(using default 128 bytes)
AC_DEFINE(LT_SMP_CACHE_BYTES, 128, Largest L1 cache size we know of, should work on all archs.)
AC_DEFINE(LT_SMP_CACHE_BYTES, 128, Largest L1 cache size we know of should work on all archs.)
AC_DEFINE(lt_cacheline_aligned, __attribute__((__aligned__(LT_SMP_CACHE_BYTES))), LibTorrent defined cacheline aligned.)
])
])