Author: pluto Date: Tue Dec 12 18:50:06 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix another mid-air collision.
---- Files affected:
SOURCES:
amarok-gcc4.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/amarok-gcc4.patch
diff -u /dev/null SOURCES/amarok-gcc4.patch:1.1
--- /dev/null Tue Dec 12 19:50:07 2006
+++ SOURCES/amarok-gcc4.patch Tue Dec 12 19:50:01 2006
@@ -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:
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
