summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-10 17:35:45 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-10 17:35:45 +0000
commitd7d7da12ecbe0e84bd0cceb58b25cec0e75015cf (patch)
treed3580f0a61a8cdf6fcbcfc74553861766ff78a38
parent68c3ce1075a6a29c5ff351a01ce0784999a0e051 (diff)
- (bal) Handle broken krb4 issues on Solaris with multiple defined u_*_t
types. Patch by Jan IVEN <Jan.Iven@cern.ch>
-rw-r--r--ChangeLog4
-rw-r--r--defines.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a340a433e..c4f797743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120010611 120010611
2 - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller 2 - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller
3 <markm@swoon.net> 3 <markm@swoon.net>
4 - (bal) Handle broken krb4 issues on Solaris with multiple defined u_*_t
5 types. Patch by Jan IVEN <Jan.Iven@cern.ch>
4 6
520010610 720010610
6 - (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c 8 - (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c
@@ -5599,4 +5601,4 @@
5599 - Wrote replacements for strlcpy and mkdtemp 5601 - Wrote replacements for strlcpy and mkdtemp
5600 - Released 1.0pre1 5602 - Released 1.0pre1
5601 5603
5602$Id: ChangeLog,v 1.1274 2001/06/10 17:24:51 mouring Exp $ 5604$Id: ChangeLog,v 1.1275 2001/06/10 17:35:45 mouring Exp $
diff --git a/defines.h b/defines.h
index 42a661a39..8a3d08c98 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
1#ifndef _DEFINES_H 1#ifndef _DEFINES_H
2#define _DEFINES_H 2#define _DEFINES_H
3 3
4/* $Id: defines.h,v 1.65 2001/05/17 03:40:05 mouring Exp $ */ 4/* $Id: defines.h,v 1.66 2001/06/10 17:35:46 mouring Exp $ */
5 5
6/* Some platforms need this for the _r() functions */ 6/* Some platforms need this for the _r() functions */
7#if !defined(_REENTRANT) && !defined(SNI) 7#if !defined(_REENTRANT) && !defined(SNI)
@@ -199,6 +199,7 @@ typedef unsigned long u_int32_t;
199# endif 199# endif
200# endif 200# endif
201# endif 201# endif
202#define __BIT_TYPES_DEFINED__
202#endif 203#endif
203 204
204/* 64-bit types */ 205/* 64-bit types */