svn rev #25199: trunk/src/ config/ include/

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25199
Commit By: hartmans
Log Message:
Protect autoconf #defines (HAVE_FOO, et al) in win-mac.h with #ifdef KRB5_PRIVATE add -DKRB5_PRIVATE to CPPFLAGS in win-pre.in and to ALL_CXXFLAGS and ALL_CFLAGS in pre.in

Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
Signed-off-by: Sam Hartman <hartmans at debian.org>


Changed Files:
U   trunk/src/config/pre.in
U   trunk/src/config/win-pre.in
U   trunk/src/include/win-mac.h
Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in	2011-09-19 00:58:43 UTC (rev 25198)
+++ trunk/src/config/pre.in	2011-09-19 00:58:48 UTC (rev 25199)
@@ -156,9 +156,11 @@
 #		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@

Modified: trunk/src/config/win-pre.in
===================================================================
--- trunk/src/config/win-pre.in	2011-09-19 00:58:43 UTC (rev 25198)
+++ trunk/src/config/win-pre.in	2011-09-19 00:58:48 UTC (rev 25199)
@@ -130,7 +130,7 @@
 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
 

Modified: trunk/src/include/win-mac.h
===================================================================
--- trunk/src/include/win-mac.h	2011-09-19 00:58:43 UTC (rev 25198)
+++ trunk/src/include/win-mac.h	2011-09-19 00:58:48 UTC (rev 25199)
@@ -101,6 +101,7 @@
 #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 @@
 #define KRB5_USE_INET6
 #define NEED_INSIXADDR_ANY
 #define ENABLE_THREADS
+#endif
 
 #define WM_KERBEROS5_CHANGED "Kerberos5 Changed"
 #ifdef KRB4
@@ -158,10 +160,12 @@
 #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