From 77add1ec32d71a55c22836eb5e814be6ad3f8cde Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 20 Jan 2007 12:05:22 +0000
Subject: [PATCH] Don't define KRB5_PRIVATE, since it's not tested any more

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19083 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/aclocal.m4                   | 3 +--
 src/config/pre.in                | 2 +-
 src/config/win-pre.in            | 2 +-
 src/include/krb5/krb5.hin        | 4 ----
 src/lib/krb4/RealmsConfig-glue.c | 5 -----
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c4ce88aa5..12daf2a27 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -78,8 +78,7 @@ WITH_KRB4 dnl
 KRB5_AC_CHOOSE_ET dnl
 KRB5_AC_CHOOSE_SS dnl
 KRB5_AC_CHOOSE_DB dnl
-dnl allow stuff in tree to access deprecated/private stuff for now
-dnl AC_DEFINE([KRB5_PRIVATE], 1, [Define only if building in-tree])
+dnl allow stuff in tree to access deprecated stuff for now
 dnl AC_DEFINE([KRB5_DEPRECATED], 1, [Define only if building in-tree])
 AC_C_CONST dnl
 WITH_NETLIB dnl
diff --git a/src/config/pre.in b/src/config/pre.in
index a22c39742..98c2a71b8 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -158,7 +158,7 @@ FAKELIBDIR=$(FAKEPREFIX)/lib
 # PTHREAD_CFLAGS set by configure, not included in CFLAGS so that we
 #		don't pull the pthreads library into shared libraries
 ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
-	-DKRB5_DEPRECATED=1 -DKRB5_PRIVATE=1 \
+	-DKRB5_DEPRECATED=1 \
 	$(CPPFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
 
 CFLAGS = @CFLAGS@
diff --git a/src/config/win-pre.in b/src/config/win-pre.in
index 7cadbe903..39abe6a97 100644
--- a/src/config/win-pre.in
+++ b/src/config/win-pre.in
@@ -130,7 +130,7 @@ KFWFLAGS=-DUSE_LEASH=1
 CC=cl
 
 PDB_OPTS=-Fd$(OUTPRE)\ -FD
-CPPFLAGS=-I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 $(DNSFLAGS) -DKRB5_PRIVATE=1 -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -D_CRT_SECURE_NO_DEPRECATE $(KFWFLAGS) $(TIME_T_FLAGS)
+CPPFLAGS=-I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 $(DNSFLAGS) -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -D_CRT_SECURE_NO_DEPRECATE $(KFWFLAGS) $(TIME_T_FLAGS)
 CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF)
 LOPTS=-nologo -incremental:no
 
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 5565e30ff..220464326 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -60,10 +60,6 @@
 #ifndef KRB5_DEPRECATED
 #define KRB5_DEPRECATED 0
 #endif
-/* Do not expose private interfaces.  Build system will override. */
-#ifndef KRB5_PRIVATE
-#define KRB5_PRIVATE 0
-#endif
 
 #if defined(__MACH__) && defined(__APPLE__)
 #	include <TargetConditionals.h>
diff --git a/src/lib/krb4/RealmsConfig-glue.c b/src/lib/krb4/RealmsConfig-glue.c
index dbdfe54cd..740d881c4 100644
--- a/src/lib/krb4/RealmsConfig-glue.c
+++ b/src/lib/krb4/RealmsConfig-glue.c
@@ -40,11 +40,6 @@
 #include "k5-int.h"		/* for accessor, addrlist stuff */
 #include "port-sockets.h"
 
-#define KRB5_PRIVATE 1
-/* For krb5_get_default_config_files and krb5_free_config_files */
-#include "krb5.h"
-#undef KRB5_PRIVATE
-
 /* These two *must* be kept in sync to avoid buffer overflows. */
 #define SCNSCRATCH	"%1023s"
 #define SCRATCHSZ	1024
-- 
2.26.2