From: Tom Yu <tlyu@mit.edu>
Date: Tue, 26 Jan 2010 22:55:07 +0000 (+0000)
Subject: define MIN() in lib/gssapi/krb5/prf.c
X-Git-Tag: krb5-1.9-beta1~372
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b3963547981b74413a6bafe1ae6c9c1c9e28416c;p=krb5.git

define MIN() in lib/gssapi/krb5/prf.c

Apply patch from Doug Engert to define MIN(), which was causing prf.c
to fail compilation on Solaris.  (The definition was probably leaking
from sys/param.h, included indirectly somehow.)

ticket: 6648
target_version: 1.8
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23673 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/krb5/prf.c b/src/lib/gssapi/krb5/prf.c
index f87c6b0c1..79e2d8759 100644
--- a/src/lib/gssapi/krb5/prf.c
+++ b/src/lib/gssapi/krb5/prf.c
@@ -32,6 +32,10 @@
 #include "gssapiP_krb5.h"
 #include <stdarg.h>
 
+#ifndef MIN             /* Usually found in <sys/param.h>. */
+#define MIN(_a,_b)  ((_a)<(_b)?(_a):(_b))
+#endif
+
 OM_uint32
 krb5_gss_pseudo_random(OM_uint32 *minor_status,
                        gss_ctx_id_t context,