diff -aur libtorrent-0.12.6/src/data/memory_chunk.cc libtorrent-0.12.6-new//src/data/memory_chunk.cc
--- libtorrent-0.12.6/src/data/memory_chunk.cc	2009-11-12 09:03:54.000000000 +0100
+++ libtorrent-0.12.6-new//src/data/memory_chunk.cc	2011-04-28 19:26:34.868055574 +0200
@@ -46,6 +46,8 @@
 #include "torrent/exceptions.h"
 #include "memory_chunk.h"
 
+using std::ptrdiff_t;
+
 namespace torrent {
 
 uint32_t MemoryChunk::m_pagesize = getpagesize();
diff -aur libtorrent-0.12.6/src/torrent/data/block.h libtorrent-0.12.6-new//src/torrent/data/block.h
--- libtorrent-0.12.6/src/torrent/data/block.h	2009-11-12 09:03:57.000000000 +0100
+++ libtorrent-0.12.6-new//src/torrent/data/block.h	2011-04-28 19:26:10.738186297 +0200
@@ -37,6 +37,10 @@
 #ifndef LIBTORRENT_BLOCK_H
 #define LIBTORRENT_BLOCK_H
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 #include <vector>
 #include <torrent/common.h>
 #include <torrent/data/block_transfer.h>