From 180fe8d506d9253532f593bab4605f752eff0ffc Mon Sep 17 00:00:00 2001
From: Josh Wolfe <thejoshwolfe@gmail.com>
Date: Thu, 31 Aug 2017 17:45:06 -0700
Subject: [PATCH] fix return types of min amd max

---
 std/math/index.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/std/math/index.zig b/std/math/index.zig
index a015450760..9c0bb902af 100644
--- a/std/math/index.zig
+++ b/std/math/index.zig
@@ -180,7 +180,7 @@ pub const Cmp = enum {
     Greater,
 };
 
-pub fn min(x: var, y: var) -> @typeOf(x + y) {
+pub fn min(x: var, y: var) -> @typeOf(if (x < y) x else y) {
     if (x < y) x else y
 }
 
@@ -188,7 +188,7 @@ test "math.min" {
     assert(min(i32(-1), i32(2)) == -1);
 }
 
-pub fn max(x: var, y: var) -> @typeOf(x + y) {
+pub fn max(x: var, y: var) -> @typeOf(if (x > y) x else y) {
     if (x > y) x else y
 }