From efaafeb8e7dfedc3801277fc5656072605e4bf0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Sikora?= Date: Tue, 12 Dec 2006 18:50:01 +0000 Subject: [PATCH] - fix another mid-air collision. Changed files: amarok-gcc4.patch -> 1.1 --- amarok-gcc4.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 amarok-gcc4.patch diff --git a/amarok-gcc4.patch b/amarok-gcc4.patch new file mode 100644 index 0000000..db7c70f --- /dev/null +++ b/amarok-gcc4.patch @@ -0,0 +1,19 @@ +--- amarok-1.4.4/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h.orig 2006-10-26 22:40:20.000000000 +0200 ++++ amarok-1.4.4/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h 2006-12-11 23:23:07.181351000 +0100 +@@ -326,16 +326,6 @@ + #endif + #endif + +-#ifndef NOMINMAX +-/* Always use macro versions of these! */ +-#ifndef max +-#define max(a, b) (((a) > (b)) ? (a) : (b)) +-#endif +-#ifndef min +-#define min(a, b) (((a) < (b)) ? (a) : (b)) +-#endif +-#endif +- + /* Should use capitalized macro versions of these, as the lowercase + versions conflict with the STL spec */ + //get these from sys/param.h to avoid tons of warnings about redefining them: -- 2.44.0