* syslog.h: reverse sense of KRB5_PROVIDE_PROTOTYPES

	* krb5.hin: special-case ultrix brokenness, reverse sense of
		KRB5_PROVIDE_PROTOTYPES (becomes KRB5_NO_PROTOTYPES);
		also, NO_NESTED_PROTOTYPES -> KRB5_NO_NESTED_PROTOTYPES
	* Makefile.in: don't install NO_NESTED_PROTOTYPES, HAS_VOID_TYPE,
		and KRB5_PROVIDE_PROTOTYPES symbols into krb5.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6151 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 05186cb7522050bc64c6a8011f9010bd7f331a87..6fd59a2e0e5746658be37be0b91f21326057126e 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 22 16:03:07 1995  Tom Yu  (tlyu@dragons-lair)
+
+       * syslog.h: reverse sense of KRB5_PROVIDE_PROTOTYPES
+       * krb5.hin: special-case ultrix brokenness, reverse sense of
+               KRB5_PROVIDE_PROTOTYPES (becomes KRB5_NO_PROTOTYPES);
+               also, NO_NESTED_PROTOTYPES -> KRB5_NO_NESTED_PROTOTYPES
+       * Makefile.in: don't install NO_NESTED_PROTOTYPES, HAS_VOID_TYPE,
+               and KRB5_PROVIDE_PROTOTYPES symbols into krb5.h
 
 Thu Jun 22 11:51:10 EDT 1995   Paul Park       (pjpark@mit.edu)
        * k5-int.h - Add pointer in krb5_context for database context.

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 1fa2b4cf02448a8a1f0596db12fa427dc56f3deb..fd42525158ad05e69d840d35005357b05175d320 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -21,8 +21,6 @@ krb5-pro.h: krb5/autoconf.h
        echo "/* This is the prologue to krb5.h */" > krb5-pro.h
        echo "/* Unfortunately some of these defines are compiler dependent */" >> krb5-pro.h
        grep SIZEOF krb5/autoconf.h >> krb5-pro.h
-       grep PROTOTYPES krb5/autoconf.h >> krb5-pro.h
-       grep HAS_VOID_TYPE krb5/autoconf.h >> krb5-pro.h
        grep HAVE_STDARG_H krb5/autoconf.h >> krb5-pro.h
        echo "/* End of prologue section */"  >> krb5-pro.h
 

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 22e3c814ed52f35c24f39146ddd7771883d11c41..542efe12c78028ec173255c7948a6e274667cdc3 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -167,7 +167,7 @@ typedef char FAR * krb5_pointer;
 typedef char krb5_const FAR * krb5_const_pointer;
 #endif
 
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
+#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES)
 #define KRB5_PROTOTYPE(x) x
 #if defined(__STDC__) || defined(HAVE_STDARG_H) || defined(_WINDOWS)
 #define        KRB5_STDARG_P(x) x
@@ -179,7 +179,13 @@ typedef char krb5_const FAR * krb5_const_pointer;
 #define KRB5_STDARG_P(x) ()
 #endif /* STDC or PROTOTYPES */
 
-#ifdef NO_NESTED_PROTOTYPES
+/*
+ * This gross compiler dependency is in here because the stock Ultrix
+ * compiler defines __STDC__ but doesn't deal with nested prototypes
+ * properly.  The reason this isn't tested for is so that this header
+ * is actually useful when installed.
+ */
+#if defined(KRB5_NO_NESTED_PROTOTYPES) || (defined(__ultrix) && !defined(__GNUC__))
 #define        KRB5_NPROTOTYPE(x) ()
 #else
 #define        KRB5_NPROTOTYPE(x) KRB5_PROTOTYPE(x)

diff --git a/src/include/syslog.h b/src/include/syslog.h
index 567fc74f3ef4f16ea31cc41338fc2c436c5d6f7e..58bef0dd64dc27e8f3ca04b3a2653f41c0e5b8a6 100644 (file)
--- a/src/include/syslog.h
+++ b/src/include/syslog.h
@@ -90,7 +90,7 @@
 #define LOG_NOWAIT     0x10    /* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
+#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start                                
 /* XXX depending on #define of va_start in <stdarg.h> */