From 26f4a5deac83b47568a89d2f20763354cf3613fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
 <grubba@grubba.org>
Date: Tue, 28 Jul 2020 10:25:56 +0200
Subject: [PATCH] EFUNs: Adjusted type for min() and max().

Fixes some warnings.
---
 src/modules/_math/math.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/_math/math.c b/src/modules/_math/math.c
index 51c4e0eed1..81d18c0a5c 100644
--- a/src/modules/_math/math.c
+++ b/src/modules/_math/math.c
@@ -684,7 +684,7 @@ PIKE_MODULE_INIT
   /* function(int|float:float) */
   ADD_EFUN("round",f_round,tFunc(tNUM,tFlt),0);
 
-#define CMP_TYPE							\
+#define MINMAX_TYPE							\
   tOr4(tIfnot(tFuncV(tNone,tNot(tString),tMix),				\
 	      tFuncV(tString,tString,tString)),				\
        tFunc(tVoid,tInt0),						\
@@ -692,10 +692,11 @@ PIKE_MODULE_INIT
 	      tFuncV(tSetvar(0,tOr(tInt,tFloat)),			\
                      tSetvar(1,tOr(tInt,tFloat)),tOr(tVar(0),tVar(1)))),\
        tIfnot(tFuncV(tNone,tNot(tOr(tObj,tMix)),tMix),			\
-	      tFuncV(tMix,tMix,tMix)))
+	      tFuncV(tSetvar(0,tOr(tObj,tMix)),				\
+		     tSetvar(1,tOr(tObj,tMix)),tOr(tVar(0),tVar(1)))))
 
-  ADD_EFUN("max",f_max,CMP_TYPE,0);
-  ADD_EFUN("min",f_min,CMP_TYPE,0);
+  ADD_EFUN("max", f_max, MINMAX_TYPE, 0);
+  ADD_EFUN("min", f_min, MINMAX_TYPE, 0);
 
   ADD_EFUN("limit",f_limit,
 	   tFunc(tSetvar(0,tOr3(tFlt,tInt,tObj))
-- 
GitLab