patches/rlibtorrent-01-madvise.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1263 74f1e78b1e06
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1263
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     1
--- libtorrent-0.12.2.orig/src/data/memory_chunk.cc	(revision 1060)
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     2
+++ libtorrent-0.12.2/src/data/memory_chunk.cc	(working copy)
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     3
@@ -41,6 +41,16 @@
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     4
 #include <unistd.h>
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     5
 #include <sys/types.h>
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     6
 #include <sys/mman.h>
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     7
+#if defined(__sun) && defined(__SVR4)
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     8
+/* Ugly hack to make this compile on Solaris with g++. See
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
     9
+ * http://www.opensolaris.org/jive/thread.jspa?threadID=21035&tstart=0
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    10
+ */
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    11
+#if (_POSIX_C_SOURCE > 2) || defined(_XPG4_2)
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    12
+extern "C" {
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    13
+extern int madvise(caddr_t, size_t, int);
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    14
+}
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    15
+#endif
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    16
+#endif
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    17
 #include <rak/error_number.h>
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    18
 
74f1e78b1e06 2008-07-04 Albert Lee <[email protected]>
trisk
parents: 1248
diff changeset
    19
 #include "torrent/exceptions.h"
1248
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    20
--- libtorrent-0.12.2.orig/scripts/common.m4	2008-05-07 08:19:12.000000000 -0400
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    21
+++ libtorrent-0.12.2/scripts/common.m4	2008-06-23 17:04:24.567475080 -0400
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    22
@@ -170,7 +170,7 @@
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    23
   AC_COMPILE_IFELSE(
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    24
     [[#include <sys/types.h>
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    25
           #include <sys/mman.h>
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    26
-          void f() { static char test[1024]; madvise((void *)test, sizeof(test), MADV_NORMAL); }
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    27
+          void f() { static char test[1024]; madvise((char *)test, sizeof(test), MADV_NORMAL); }
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    28
     ]],
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    29
     [
9f6e7108cd7f 2008-06-28 Albert Lee <[email protected]>
trisk
parents: 1210
diff changeset
    30
       AC_MSG_RESULT(yes)