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

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c4ce88aa5b7330cb0dc35f01d347e1c7c1975017..12daf2a27d105acb4319b955e411b59e34b8f2f0 100644 (file)
--- 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 a22c39742111b701d1044351f29b16e18dd8c2a9..98c2a71b807f58e83114d0c8231aff623b21f5d4 100644 (file)
--- 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 7cadbe90325daaea25b297f8f856556e6453f4e1..39abe6a97e2cd63ec2b72fe66b1a8ecef9847b1f 100644 (file)
--- 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 5565e30ff5539a2550f82cc9d3b90f3bf04a42ae..22046432601c9181c63a70621d43be65927360ec 100644 (file)
--- 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 dbdfe54cd1ccb7ed73803c88f63b9a4665bf0a81..740d881c418f2719eaaf2c4e2cf8b0c5f78da67c 100644 (file)
--- 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