define MIN() in lib/gssapi/krb5/prf.c
authorTom Yu <tlyu@mit.edu>
Tue, 26 Jan 2010 22:55:07 +0000 (22:55 +0000)
committerTom Yu <tlyu@mit.edu>
Tue, 26 Jan 2010 22:55:07 +0000 (22:55 +0000)
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

src/lib/gssapi/krb5/prf.c

index f87c6b0c1a44b7f6fc3c75bc47937dcf5eee2afb..79e2d8759e0c8c5d8c3c7ddb413e8ff15d20d4a0 100644 (file)
 #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,