diff options
| author | Tom Yu <tlyu@mit.edu> | 2010-02-08 20:55:17 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2010-02-08 20:55:17 +0000 |
| commit | cad7be942b356ec6984264dfd0dfef52610bca72 (patch) | |
| tree | a2a3058d8973e33e59cf3c065a1ffc755f19b404 | |
| parent | eec3fe7f040cb6ba4510d4779c8d7b01294ad629 (diff) | |
| download | krb5-cad7be942b356ec6984264dfd0dfef52610bca72.zip krb5-cad7be942b356ec6984264dfd0dfef52610bca72.tar.gz krb5-cad7be942b356ec6984264dfd0dfef52610bca72.tar.bz2 | |
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.)
ticket: 6648
version_fixed: 1.8
status: resolved
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23701 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/krb5/prf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/gssapi/krb5/prf.c b/src/lib/gssapi/krb5/prf.c index f87c6b0..79e2d87 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, |