projects / packages / amarok.git / blame
| Commit | Line | Data |
|---|---|---|
| efaafeb8 PS |
1 | --- 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 |
| 2 | +++ amarok-1.4.4/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h 2006-12-11 23:23:07.181351000 +0100 | |
| 3 | @@ -326,16 +326,6 @@ | |
| 4 | #endif | |
| 5 | #endif | |
| 6 | ||
| 7 | -#ifndef NOMINMAX | |
| 8 | -/* Always use macro versions of these! */ | |
| 9 | -#ifndef max | |
| 10 | -#define max(a, b) (((a) > (b)) ? (a) : (b)) | |
| 11 | -#endif | |
| 12 | -#ifndef min | |
| 13 | -#define min(a, b) (((a) < (b)) ? (a) : (b)) | |
| 14 | -#endif | |
| 15 | -#endif | |
| 16 | - | |
| 17 | /* Should use capitalized macro versions of these, as the lowercase | |
| 18 | versions conflict with the STL spec */ | |
| 19 | //get these from sys/param.h to avoid tons of warnings about redefining them: | |
| 4a54ebf8 PS |
20 | --- amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp~ 2008-08-13 23:21:51.000000000 +0200 |
| 21 | +++ amarok-1.4.10/amarok/src/engine/helix/hxplayercontrol.cpp 2008-08-26 11:30:52.000000000 +0200 | |
| 22 | @@ -18,6 +18,7 @@ | |
| 23 | #include <sys/time.h> | |
| 24 | #include <sys/types.h> | |
| 25 | #include <sys/wait.h> | |
| 26 | +#include <stdlib.h> | |
| 27 | #include <unistd.h> | |
| 28 | #include <iostream> | |
| 29 | #include <cstring> |