summaryrefslogtreecommitdiff
path: root/data/aptitude/port.diff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-06-02 09:40:04 +0000
committerJay Freeman <saurik@saurik.com>2008-06-02 09:40:04 +0000
commita6b322f346c04ff7c39eb0c486e92725f3873e42 (patch)
tree40c38b3a68545593cbc4441a7c89e3ab5deecbeb /data/aptitude/port.diff
parentf3c126fb81304eeb02275bea8261bd1e9078393a (diff)
Finally commiting aptitude.
git-svn-id: http://svn.telesphoreo.org/trunk@300 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/aptitude/port.diff')
-rw-r--r--data/aptitude/port.diff37
1 files changed, 37 insertions, 0 deletions
diff --git a/data/aptitude/port.diff b/data/aptitude/port.diff
new file mode 100644
index 000000000..1918b001a
--- /dev/null
+++ b/data/aptitude/port.diff
@@ -0,0 +1,37 @@
+diff -ru aptitude-0.4.4.orig/src/generic/util/eassert.cc aptitude-0.4.4.orig+iPhone/src/generic/util/eassert.cc
+--- aptitude-0.4.4.orig/src/generic/util/eassert.cc 2006-10-27 04:26:08.000000000 +0000
++++ aptitude-0.4.4.orig+iPhone/src/generic/util/eassert.cc 2008-05-13 09:07:58.000000000 +0000
+@@ -31,6 +31,6 @@
+
+ std::string AssertionFailure::errmsg() const
+ {
+- return ssprintf("%s:%d: %s: Assertion \"%s\" failed.",
++ return ssprintf("%s:%ld: %s: Assertion \"%s\" failed.",
+ file.c_str(), line, func.c_str(), exp.c_str());
+ }
+diff -ru aptitude-0.4.4.orig/src/generic/util/util.cc aptitude-0.4.4.orig+iPhone/src/generic/util/util.cc
+--- aptitude-0.4.4.orig/src/generic/util/util.cc 2006-10-27 04:26:08.000000000 +0000
++++ aptitude-0.4.4.orig+iPhone/src/generic/util/util.cc 2008-05-13 09:08:45.000000000 +0000
+@@ -154,9 +154,9 @@
+ {
+ char *buf = new char[bufsize];
+
+- char *result = strerror_r(errnum, buf, bufsize);
++ int result = strerror_r(errnum, buf, bufsize);
+
+- if(result == NULL)
++ if(result == -1)
+ {
+ delete[] buf;
+
+diff -ru aptitude-0.4.4.orig/src/vscreen/transcode.cc aptitude-0.4.4.orig+iPhone/src/vscreen/transcode.cc
+--- aptitude-0.4.4.orig/src/vscreen/transcode.cc 2006-10-27 04:26:08.000000000 +0000
++++ aptitude-0.4.4.orig+iPhone/src/vscreen/transcode.cc 2008-05-13 09:30:43.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <generic/util/eassert.h>
+ #include <errno.h>
+ #include <iconv.h>
++#include <langinfo.h>
+
+ using namespace std;
+