Protect autoconf #defines (HAVE_FOO, et al) in win-mac.h with #ifdef KRB5_PRIVATE...

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Signed-off-by: Sam Hartman <hartmans@debian.org>
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25199 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/pre.in b/src/config/pre.in
index e009deaf07ffec26d8092b72311fd2ebd7782f9e..01f102e62e0771b557abb8cf668fc2dafc2383a6 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -156,9 +156,11 @@ FAKELIBDIR=$(FAKEPREFIX)/lib
 #              don't pull the pthreads library into shared libraries
 ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
        -DKRB5_DEPRECATED=1 \
+       -DKRB5_PRIVATE \
        $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
 ALL_CXXFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
        -DKRB5_DEPRECATED=1 \
+       -DKRB5_PRIVATE \
        $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS)
 
 CFLAGS = @CFLAGS@

diff --git a/src/config/win-pre.in b/src/config/win-pre.in
index d992d95997720d7dbb601d9cfaf63795be4b7525..ff79095fd0dc413ee603c61919e1bde7ee621c9b 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$(top_srcdir)\include -I$(top_srcdir)\include\krb5 $(DNSFLAGS) -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -D_CRT_SECURE_NO_DEPRECATE $(KFWFLAGS) $(TIME_T_FLAGS)
+CPPFLAGS=-I$(top_srcdir)\include -I$(top_srcdir)\include\krb5 $(DNSFLAGS) -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -DKRB5_PRIVATE -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/win-mac.h b/src/include/win-mac.h
index 84ffe7976c1285587d394115f353172b3941ab78..473ab373eabd2894c6ecde6021540ec34ca47044 100644 (file)
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -101,6 +101,7 @@ typedef _W64 int         ssize_t;
 #define MAXPATHLEN      256            /* Also for Windows temp files */
 #endif
 
+#ifdef KRB5_PRIVATE
 #define HAVE_NETINET_IN_H
 #define MSDOS_FILESYSTEM
 #define HAVE_STRING_H
@@ -118,6 +119,7 @@ typedef _W64 int         ssize_t;
 #define KRB5_USE_INET6
 #define NEED_INSIXADDR_ANY
 #define ENABLE_THREADS
+#endif
 
 #define WM_KERBEROS5_CHANGED "Kerberos5 Changed"
 #ifdef KRB4
@@ -158,10 +160,12 @@ typedef _W64 int         ssize_t;
 #define INI_RECENT_LOGINS "Recent Logins"
 #define INI_LOGIN       "Login"
 
+#ifdef KRB5_PRIVATE
 #define HAS_VOID_TYPE
 #define HAVE_STDARG_H
 #define HAVE_SYS_TYPES_H
 #define HAVE_STDLIB_H
+#endif
 
 /* This controls which encryption routines libcrypto will provide */
 #define PROVIDE_DES_CBC_MD5