From c138a6784e6d32ef5c1e75e1486dbf860bf5ad80 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 22 May 2003 22:25:03 +0000 Subject: [PATCH] Default KRB5_DEPRECATED to 0, but force it to 1 for in-tree stuff ticket: 1483 tags: pullup status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15469 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 4 ++++ src/aclocal.m4 | 1 + src/include/ChangeLog | 5 +++++ src/include/krb5.hin | 21 ++++++--------------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c87b8fa99..05a8b7839 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2003-05-22 Tom Yu + + * aclocal.m4: Add -DKRB5_DEPRECATED=1 so stuff in tree builds. + 2003-04-24 Ken Raeburn * aclocal.m4: Require autoconf 2.52 only. diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 1a7c11b3c..8733a05a3 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -58,6 +58,7 @@ KRB5_AC_CHOOSE_SS dnl KRB5_AC_CHOOSE_DB dnl dnl allow stuff in tree to access deprecated/private stuff for now AC_DEFINE([KRB5_PRIVATE], 1, [Define only if building in-tree]) +AC_DEFINE([KRB5_DEPRECATED], 1, [Define only if building in-tree]) AC_C_CONST dnl WITH_NETLIB dnl WITH_HESIOD dnl diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 55ec2fee8..552d4c34d 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2003-05-22 Tom Yu + + * krb5.hin: Default KRB5_DEPRECATED to 0. Default KRB5_PRIVATE to + 0 on all platforms. + 2003-05-22 Sam Hartman * k5-int.h: krb5int_populate_gic_opt returns void diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 0bf822e4a..9c7123e77 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -56,8 +56,13 @@ #ifndef KRB5_GENERAL__ #define KRB5_GENERAL__ +/* By default, do not expose deprecated interfaces. */ #ifndef KRB5_DEPRECATED -#define KRB5_DEPRECATED 1 /* Expose deprecated things for now. */ +#define KRB5_DEPRECATED 0 +#endif +/* Do not expose private interfaces. Build system will override. */ +#ifndef KRB5_PRIVATE +#define KRB5_PRIVATE 0 #endif #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__)) @@ -65,20 +70,6 @@ # if TARGET_RT_MAC_CFM # error "Use KfM 4.0 SDK headers for CFM compilation." # endif - -# ifndef KRB5_PRIVATE /* Allow e.g. build system to override */ -# define KRB5_PRIVATE 0 -# endif -#else -#if defined(_WIN32) -# ifndef KRB5_PRIVATE -# define KRB5_PRIVATE 0 -# endif -#else -# ifndef KRB5_PRIVATE -# define KRB5_PRIVATE 1 -# endif -#endif #endif #if defined(_MSDOS) || defined(_WIN32) -- 2.26.2