From: Tom Yu Date: Sat, 15 Jun 2002 00:51:42 +0000 (+0000) Subject: * krb524.h: Back out erroneous merge of post-1.2.5 change X-Git-Tag: krb5-1.3-alpha1~705 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a819d4c2fec9d03752e6c857bdc0eddae976f576;p=krb5.git * krb524.h: Back out erroneous merge of post-1.2.5 change temporarily. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14508 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 4fa5f572f..6601e393e 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,8 @@ +2002-06-14 Tom Yu + + * krb524.h: Back out erroneous merge of post-1.2.5 change + temporarily. + 2002-06-14 Alexandra Ellwood * krb524.h: Updated C++ protection to not interfere with emacs diff --git a/src/krb524/krb524.h b/src/krb524/krb524.h index 4c6a07eac..552058df0 100644 --- a/src/krb524/krb524.h +++ b/src/krb524/krb524.h @@ -28,8 +28,6 @@ #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__)) #include - #include - #include #ifndef KRB524_PRIVATE /* Allow e.g. build system to override */ #define KRB524_PRIVATE 0 #endif