From bbdf66fff59c3c23f1cd8f532714e9c29b36dd7a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 12 Dec 2008 15:31:02 +0000 Subject: [PATCH] Additional fix required to build apt with g++-4.3.x on i586 --- apt-0.5.15lorg2-alt-gcc4.3.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/apt-0.5.15lorg2-alt-gcc4.3.patch b/apt-0.5.15lorg2-alt-gcc4.3.patch index 507cfda..ec37309 100644 --- a/apt-0.5.15lorg2-alt-gcc4.3.patch +++ b/apt-0.5.15lorg2-alt-gcc4.3.patch @@ -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 - #if defined(__GNUG__) --#define MIN(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 +-#if defined(__GNUG__) ++#if 0 + #define MIN(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