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

diff --git a/src/ChangeLog b/src/ChangeLog
index c87b8fa9938310dfebed4826faa6f10d844c00db..05a8b7839f27867fbfe76951396730c3f08b35d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-22  Tom Yu  <tlyu@mit.edu>
+
+       * aclocal.m4: Add -DKRB5_DEPRECATED=1 so stuff in tree builds.
+
 2003-04-24  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4: Require autoconf 2.52 only.

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 1a7c11b3cd7a79e2b138ae963c88d673cfedfde2..8733a05a335044e301eb169296c73f6e0afcb239 100644 (file)
--- 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 55ec2fee86dd2a4cd4851f7e2de82c54aef0d0f6..552d4c34d2c73818fc276bc306eac5fb39b55dd7 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-22  Tom Yu  <tlyu@mit.edu>
+
+       * krb5.hin: Default KRB5_DEPRECATED to 0.  Default KRB5_PRIVATE to
+       0 on all platforms.
+
 2003-05-22  Sam Hartman  <hartmans@mit.edu>
 
        * k5-int.h: krb5int_populate_gic_opt returns void

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 0bf822e4ab665fb34b6aacef3ae7a636021e22e2..9c7123e7795c50c83ab7b012a833e68b0af20b0c 100644 (file)
--- 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)