assume ANSI C: delete no-volatile support, and most no-prototype support

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

8 files changed, 22 insertions, 33 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 88434bc2e6..25b14971c9 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,15 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* win-mac.h (HAS_ANSI_VOLATILE, KRB5_PROVIDE_PROTOTYPES): Don't
+	define.
+
+	* configure.in: Don't use KRB5_CHECK_PROTOS.  Don't check for use
+	of prototypes inside structures.
+
+	* syslog.h (syslog, vsyslog, openlog, closelog, setlogmask):
+	Always use prototype versions of declarations; delete
+	non-prototype declarations.
+
 2001-04-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-int.h (socklen_t) [NEED_SOCKETS] [!HAVE_SOCKLEN_T]: Define as
diff --git a/src/include/configure.in b/src/include/configure.in
index faaea125b6..c4f993e6fe 100644
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -38,19 +38,6 @@ if test $krb5_cv_has_ansi_stdio = yes; then
 AC_DEFINE(ANSI_STDIO)
 fi
 dnl
-KRB5_CHECK_PROTOS
-dnl
-AC_MSG_CHECKING([prototypes in structs])
-AC_CACHE_VAL(krb5_cv_struct_prototypes,
-[AC_TRY_COMPILE(
-[typedef int i_t; typedef struct foo { int (*foofn)(i_t, i_t); } *footype;],
-[],
-krb5_cv_struct_prototypes=yes, krb5_cv_struct_prototypes=no)])
-AC_MSG_RESULT($krb5_cv_struct_prototypes)
-if test $krb5_cv_struct_prototypes = no; then
-AC_DEFINE(KRB5_NO_NESTED_PROTOTYPES)
-fi
-dnl
 dnl Word sizes...
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index b9bd0d7515..0ae76c0bb8 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* krb.h: Make struct sockaddr_in declaration unconditional.
+
 2001-04-10  Ken Raeburn  <raeburn@mit.edu>
 
 	* des.h (des_pcbc_encrypt, des_quad_cksum, des_cbc_cksum,
diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 48dd3e705c..b2cd939242 100644
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -389,9 +389,7 @@ extern struct _krb5_context FAR * krb5__krb4_context;
  * Function Prototypes for Kerberos V4.
  */
 
-#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES)
 struct sockaddr_in;
-#endif
 
 /* dest_tkt.c */
 KRB5_DLLIMP int KRB5_CALLCONV dest_tkt
diff --git a/src/include/sys/ChangeLog b/src/include/sys/ChangeLog
index 8cdc381a1f..f7e6e39ca4 100644
--- a/src/include/sys/ChangeLog
+++ b/src/include/sys/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* syslog.h (syslog, vsyslog, openlog, closelog, setlogmask):
+	Always use prototype versions of declarations; delete
+	non-prototype declarations.
+
 Wed Jun 12 00:44:07 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* syslog.h: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
diff --git a/src/include/sys/syslog.h b/src/include/sys/syslog.h
index 6adae5a491..96623103be 100644
--- a/src/include/sys/syslog.h
+++ b/src/include/sys/syslog.h
@@ -90,7 +90,6 @@
 #define LOG_NOWAIT	0x10	/* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start				
 /* XXX depending on #define of va_start in <stdarg.h> */
@@ -99,12 +98,5 @@ extern void vsyslog  (int , const char *, va_list );
 extern void openlog  (const char *, int , int );
 extern void closelog  (void );
 extern int setlogmask  (int );
-#else /* STDC */
-extern void syslog  ();
-extern void vsyslog  ();
-extern void openlog  ();
-extern void closelog  ();
-extern int setlogmask  ();
-#endif /* STDC */
 
 #endif
diff --git a/src/include/syslog.h b/src/include/syslog.h
index c11a9603fb..f587921e14 100644
--- a/src/include/syslog.h
+++ b/src/include/syslog.h
@@ -90,7 +90,6 @@
 #define LOG_NOWAIT	0x10	/* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start				
 /* XXX depending on #define of va_start in <stdarg.h> */
@@ -99,12 +98,5 @@ extern void vsyslog  (int , const char *, va_list );
 extern void openlog  (const char *, int , int );
 extern void closelog  (void );
 extern int setlogmask  (int );
-#else /* STDC */
-extern void syslog  ();
-extern void vsyslog  ();
-extern void openlog  ();
-extern void closelog  ();
-extern int setlogmask  ();
-#endif /* STDC */
 
 #endif
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index ffd3f63432..447dc1ab9e 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -152,9 +152,7 @@ typedef unsigned char	u_char;
 #define INI_RECENT_LOGINS "Recent Logins"    
 #define INI_LOGIN       "Login"
 
-#define HAS_ANSI_VOLATILE
 #define HAS_VOID_TYPE
-#define KRB5_PROVIDE_PROTOTYPES
 #define HAVE_STDARG_H
 #define HAVE_SYS_TYPES_H
 #define HAVE_STDLIB_H