svn rev #23673: trunk/src/lib/gssapi/krb5/

tlyu@MIT.EDU tlyu at MIT.EDU
Tue Jan 26 17:55:07 EST 2010


http://src.mit.edu/fisheye/changelog/krb5/?cs=23673
Commit By: tlyu
Log Message:
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   trunk/src/lib/gssapi/krb5/prf.c
Modified: trunk/src/lib/gssapi/krb5/prf.c
===================================================================
--- trunk/src/lib/gssapi/krb5/prf.c	2010-01-26 18:43:29 UTC (rev 23672)
+++ trunk/src/lib/gssapi/krb5/prf.c	2010-01-26 22:55:07 UTC (rev 23673)
@@ -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,




More information about the cvs-krb5 mailing list