From a0c7f99a5e35f8f3abd6b92d2ce66ba24f601b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 10 Nov 2014 20:58:56 +0100 Subject: [PATCH] scp: avoid redefining MAX On Haiku, we end up including from sim_sock.h which defines MAX. --- scp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scp.c b/scp.c index 0e052ef5..e84149b3 100644 --- a/scp.c +++ b/scp.c @@ -242,7 +242,9 @@ #include #endif +#ifndef MAX #define MAX(a,b) (((a) >= (b)) ? (a) : (b)) +#endif /* search logical and boolean ops */