svn rev #23701: branches/krb5-1-8/src/lib/gssapi/krb5/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23701
Commit By: tlyu
Log Message:
ticket: 6648
version_fixed: 1.8
status: resolved

pull up r23673 from trunk

 ------------------------------------------------------------------------
 r23673 | tlyu | 2010-01-26 17:55:07 -0500 (Tue, 26 Jan 2010) | 9 lines

 ticket: 6648
 target_version: 1.8
 tags: pullup
 subject: 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.)


Changed Files:
U   branches/krb5-1-8/src/lib/gssapi/krb5/prf.c
Modified: branches/krb5-1-8/src/lib/gssapi/krb5/prf.c
===================================================================
--- branches/krb5-1-8/src/lib/gssapi/krb5/prf.c	2010-02-08 20:55:12 UTC (rev 23700)
+++ branches/krb5-1-8/src/lib/gssapi/krb5/prf.c	2010-02-08 20:55:17 UTC (rev 23701)
@@ -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,