darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Additional fix required to build apt with g++-4.3.x on i586

Browse Source
This commit is contained in:
Дмитрий Левин 2008-12-12 15:31:02 +00:00
parent d20fc76a4d
commit bbdf66fff5
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apt-0.5.15lorg2-alt-gcc4.3.patch
View File

@ -90,17 +90,15 @@ diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/strutl.h apt-0.5.15lorg2/apt-pkg
diff -Naur apt-0.5.15lorg2.orig/apt-pkg/contrib/system.h apt-0.5.15lorg2/apt-pkg/contrib/system.h
--- apt-0.5.15lorg2.orig/apt-pkg/contrib/system.h 2008-09-01 22:42:04 +0400
+++ apt-0.5.15lorg2/apt-pkg/contrib/system.h 2008-12-12 16:21:25 +0300
@@ -27,8 +27,8 @@
// GNU C++ has a min/max operator <coolio>
#if defined(__GNUG__)
-#define MIN(A,B) ((A) <? (B))
-#define MAX(A,B) ((A) >? (B))
+#define MIN(A,B) std::min(A,B)
+#define MAX(A,B) std::max(A,B)
@@ -26,7 +26,7 @@
#endif
/* Templates tend to mess up existing code that uses min/max because of the
// GNU C++ has a min/max operator <coolio>
-#if defined(__GNUG__)
+#if 0
#define MIN(A,B) ((A) <? (B))
#define MAX(A,B) ((A) >? (B))
#endif
diff -Naur apt-0.5.15lorg2.orig/apt-pkg/indexfile.cc apt-0.5.15lorg2/apt-pkg/indexfile.cc
--- apt-0.5.15lorg2.orig/apt-pkg/indexfile.cc 2008-09-01 22:42:04 +0400
+++ apt-0.5.15lorg2/apt-pkg/indexfile.cc 2008-12-12 16:21:25 +0300