Commit Diff

Commit:
5c23a559a76e204dc3d66ce265abeba149c1a3c2
From:
Christian Weisgerber <naddy@mips.inka.de>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
guard MIN() macro against redefinition
Actions:
Patch | Tree
commit - f3296add5bdbbb73f33c8f4b1576a24aae32924b
commit + 5c23a559a76e204dc3d66ce265abeba149c1a3c2
blob - 0758bbe85ffe3061227ab30c2fdfcdad6c012a06
blob + 33b5f481ddcb50dbde193904a0d6e81a6c684a0f
--- lib/patch.c
+++ lib/patch.c
@@ -52,7 +52,9 @@
 #include "got_lib_privsep.h"
 #include "got_lib_hash.h"
 
+#ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
 
 struct got_patch_hunk {
 	STAILQ_ENTRY(got_patch_hunk) entries;