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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7ae63a661356370bac245b43c86e752cdc69eb7e..ef85fce7719405a0a0a1eec86c49fdfa0c789cb5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * acconfig.h (KRB5_NO_PROTOTYPES, KRB5_PROVIDE_PROTOTYPES,
+       KRB5_NO_NESTED_PROTOTYPES): Deleted.
+       * aclocal.m4 (HAS_ANSI_VOLATILE, KRB5_CHECK_PROTOS): Deleted.
+
 2001-04-25  Ken Raeburn  <raeburn@mit.edu>
 
        * acconfig.h (HAVE_SOCKLEN_T): Add.

diff --git a/src/acconfig.h b/src/acconfig.h
index e71089a5f62acf1c356f7229db990338d7e9d514..263d00adbe5c85664dae3713dc812a8193d09339 100644 (file)
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -7,9 +7,6 @@
    handle it on some systems.  */
 
 #undef ANSI_STDIO
-#undef KRB5_NO_PROTOTYPES
-#undef KRB5_PROVIDE_PROTOTYPES
-#undef KRB5_NO_NESTED_PROTOTYPES
 
 #undef NO_YYLINENO
 #undef POSIX_FILE_LOCKS

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 012b01e57dc07adcd89a7d8ecdbf8919354ca3bb..1a9d38f63e01b226230ae1d3c73b61c0e3972d66 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -600,38 +600,6 @@ AC_ARG_WITH([netlib],
 [AC_LIBRARY_NET]
 )])dnl
 dnl
-dnl HAS_ANSI_VOLATILE
-dnl
-define(HAS_ANSI_VOLATILE,[
-AC_MSG_CHECKING([volatile])
-AC_CACHE_VAL(krb5_cv_has_ansi_volatile,
-[AC_TRY_COMPILE(
-[volatile int x();], [],
-krb5_cv_has_ansi_volatile=yes, krb5_cv_has_ansi_volatile=no)])
-AC_MSG_RESULT($krb5_cv_has_ansi_volatile)
-if test $krb5_cv_has_ansi_volatile = no; then
-ADD_DEF(-Dvolatile=)
-fi
-])dnl
-dnl
-dnl
-dnl Check for prototype support - used by application not including k5-int.h
-dnl
-define(KRB5_CHECK_PROTOS,[
-AC_MSG_CHECKING([prototype support])
-AC_CACHE_VAL(krb5_cv_has_prototypes,
-[AC_TRY_COMPILE(
-[int x(double y, int z);], [],
-krb5_cv_has_prototypes=yes, krb5_cv_has_prototypes=no)])
-AC_MSG_RESULT($krb5_cv_has_prototypes)
-if test $krb5_cv_has_prototypes = no; then
-AC_DEFINE(KRB5_NO_PROTOTYPES)
-else
-AC_DEFINE(KRB5_PROVIDE_PROTOTYPES)
-fi
-dnl *never* set NARROW_PROTOTYPES
-])dnl
-dnl
 dnl Check if stdarg or varargs is available *and compiles*; prefer stdarg.
 dnl (This was sent to djm for incorporation into autoconf 3/12/1996.  KR)
 dnl

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index c7523005207e675f9858eb5c3d343598f3e587b5..c2ae0f4da60c828314240af03a891e4e706afe03 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Don't use KRB5_CHECK_PROTOS.
+
 2001-04-02  Tom Yu  <tlyu@mit.edu>
 
        * login.M: Don't include "= 0" as part of the "accept_passwd"

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index ae908c2d272ef491d16d007622bb43fdc76cd71f..058068eae39512c258f7cee17e22a89f3555af13 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -169,8 +169,6 @@ dnl
 K5_AC_CHECK_FILES(/etc/environment /etc/TIMEZONE)
 dnl
 dnl
-KRB5_CHECK_PROTOS
-dnl
 ADD_DEF(-DKERBEROS)
 AC_C_CONST
 if test "$krb5_cv_build_krb4_libs" = yes; then

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 74bfbe691bd9b19341d6d5096a35ce6f6ca9e077..b23f1d4a9ab8d40dd9425c6e47d9a86b35dd2998 100644 (file)
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * ftp_var.h (PROTOTYPE): Always define to use supplied prototype.
+       * secure.h (PROTOTYPE): Likewise.
+
 2001-03-07  Ken Raeburn  <raeburn@mit.edu>
 
        * cmds.c (strerror): Only define if not HAVE_STRERROR.

diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h
index 99c5ea0b683849996cdd357d87714a1cdcc5d294..7bdc51f079b1b0681b6a5a6c6bd186e8f020128e 100644 (file)
--- a/src/appl/gssftp/ftp/ftp_var.h
+++ b/src/appl/gssftp/ftp/ftp_var.h
@@ -141,11 +141,7 @@ extern     char *mktemp();
 extern int command(char *, ...);
 #endif
 
-#if (defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(KRB5_PROVIDE_PROTOTYPES)) && !defined(KRB5_NO_PROTOTYPES)
 #define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif /* STDC or PROTOTYPES */
 
 char *remglob PROTOTYPE((char **, int));
 int another PROTOTYPE((int *, char ***, char *));

diff --git a/src/appl/gssftp/ftp/secure.h b/src/appl/gssftp/ftp/secure.h
index 0efb612d17759f919855b78dbfed110b19b1943e..6a4ee4c99861e80e33d3b32125e555db80f96090 100644 (file)
--- a/src/appl/gssftp/ftp/secure.h
+++ b/src/appl/gssftp/ftp/secure.h
@@ -5,11 +5,7 @@
 #define myaddr         data_addr
 #define hisaddr                hisdataaddr
 
-#if (defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(KRB5_PROVIDE_PROTOTYPES)) && !defined(KRB5_NO_PROTOTYPES)
 #define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif /* STDC or PROTOTYPES */
 
 int secure_flush PROTOTYPE((int));
 int secure_putc PROTOTYPE((int, FILE *));

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 88434bc2e68a8ffc653e33d46ccb83b7ac937a70..25b14971c9dbd94909dcb013e5d8f35324cf0a72 100644 (file)
--- 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 faaea125b64870387dc97f3a4c3aba28dbb6d1ac..c4f993e6fe50ffc107d69875c48e2ca9415def89 100644 (file)
--- 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 b9bd0d7515d317d8432e88c1d41b9d637178de08..0ae76c0bb8bb83b12f085fc84f4b5d3ed7742b1d 100644 (file)
--- 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 48dd3e705cd099bce3c013bb43b5f0c32e4e1f6f..b2cd9392424968b4aaf5131c5b19e976e5b2f3a8 100644 (file)
--- 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 8cdc381a1fac22809e459c7e247d0789e0c9eaff..f7e6e39ca4d4ceeb1842a3282848941accb0a2b4 100644 (file)
--- 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 6adae5a491888d5ea8a4748292f1ad5681c81c0f..96623103bed05e7cd7fee1c491d5646836b18978 100644 (file)
--- 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 c11a9603fb1e7f9379ce03d447f2ded1234d90af..f587921e144951b37bbddcda7c64837ad8bc2a09 100644 (file)
--- 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 ffd3f634328f762a984195bee7c2bdc960c5ffc7..447dc1ab9e4d3d13763d5349e8b7730c8d6b7a81 100644 (file)
--- 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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 959ac2e4c8085e3043d3e00aa08e3efbef551476..e9dc7149dd649b8cd58156868268e0dc846466cd 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Don't use HAS_ANSI_VOLATILE.
+
 2001-04-10  Ken Raeburn  <raeburn@mit.edu>
 
        * do_as_req.c, do_tgs_req.c, kdc_preauth.c, kdc_util.h,

diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 75f1075c50d0810e589c84b624a69747df02be3e..dfcf9ea58f4b18ed5bb6ac9b935e281b48956d3d 100644 (file)
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -7,7 +7,6 @@ AC_PROG_AWK
 KRB5_AC_INET6
 KRB5_SOCKADDR_SA_LEN
 CHECK_SIGNALS
-HAS_ANSI_VOLATILE
 dnl
 dnl --with-vague-errors disables useful error messages.
 dnl

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 028aab4482109e6ae8b783ae223700c312b4f888..ec34efe65aa67b19c4d16913d64ee7e2e6e2642b 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Don't use HAS_ANSI_VOLATILE.
+
 2001-04-12  Danilo Almeida  <dalmeida@mit.edu>
 
        * cksum.c (des_cbc_cksum): Gee, a consistent calling convntion.

diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 291b4490816c854e8a43ea4a4072402bf93bea4c..14b90b7eef325ed9ebeca1c6abf025744f3867fe 100644 (file)
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -5,7 +5,6 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 dnl
-HAS_ANSI_VOLATILE
 AC_MSG_CHECKING([if pragma weak supported])
 AC_CACHE_VAL(krb5_cv_pragma_weak,
 [AC_TRY_LINK(

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 0c07e50f6a87002ac54e249b1e50006708f7a32a..e6656bc421d5c42b75c365b2af22ba4db6d9f926 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Don't use HAS_ANSI_VOLATILE.
+
 2001-04-25  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Moved test for socklen_t to include directory.

diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 88ff70e1eddd8e01c1eac48749689923ffcca2b3..aaecffade9ca4fea929f901bf65992174944dfd1 100644 (file)
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -8,7 +8,6 @@ AC_TYPE_UID_T
 AC_TYPE_OFF_T
 dnl
 dnl
-HAS_ANSI_VOLATILE
 AC_HEADER_STDARG
 AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h memory.h ifaddrs.h sys/filio.h)
 AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv setsid gethostbyname2 getifaddrs)

diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog
index 844ba30ac6b3d60cce2d8a9100cbfcd3ede93384..f33d71c007476a6bc55df0a65fb548b9401858b4 100644 (file)
--- a/src/mac/libraries/ChangeLog
+++ b/src/mac/libraries/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * autoconf.h (KRB5_PROVIDE_PROTOTYPES): Don't define.
+
 Wed Oct  21 17:40:00 1998  Miro Jurisic <meeroh@mit.edu>
 
        * Metrowerks: Added CodeWarrior Pro4 projects and docs

diff --git a/src/mac/libraries/autoconf.h b/src/mac/libraries/autoconf.h
index 3341630add5cc5ded9a0c6b21cb922afe5e35390..6fbbd7c120b7f5424461a150d185bab32f51db0a 100644 (file)
--- a/src/mac/libraries/autoconf.h
+++ b/src/mac/libraries/autoconf.h
@@ -4,7 +4,6 @@
 #define HAS_ANSI_CONST 1
 #define HAVE_STDLIB_H 1
 #define HAS_VOID_TYPE 1
-#define KRB5_PROVIDE_PROTOTYPES 1
 #define NO_NESTED_PROTOTYPES 1
 #define NO_YYLINENO 1
 #define USE_DIRENT_H 1

diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 9de58429a7fd0b014a5365cbea22da48791bdc9f..f5b262b7bd02649a45535572bbff76331d679d38 100644 (file)
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * trval.c (decode_len, do_prim, do_cons, do_prim_bitstring,
+       do_prim_int, do_prim_string, print_tag_type, trval, trval2):
+       Always use prototype declarations.
+
 Sun Feb 18 15:33:50 2001  Ezra Peisach  <epeisach@mit.edu>
 
        * trval.c: Add prototypes for trval() and trval2().

diff --git a/src/tests/asn.1/trval.c b/src/tests/asn.1/trval.c
index 475a5fd9a28c16103a08c279cf7cb00beda36e75..94c0774ec02cab6e63994a63a45dbd044c9bf549 100644 (file)
--- a/src/tests/asn.1/trval.c
+++ b/src/tests/asn.1/trval.c
@@ -105,22 +105,15 @@ int print_krb5_types = 0;
 
 int current_appl_type = -1;
 
-#if (defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(KRB5_PROVIDE_PROTOTYPES)) && !defined(KRB5_NO_PROTOTYPES)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-
-
-int decode_len PROTOTYPE((FILE *, unsigned char *, int));
-int do_prim PROTOTYPE((FILE *, int, unsigned char *, int, int));
-int do_cons PROTOTYPE((FILE *, unsigned char *, int, int, int *));
-int do_prim_bitstring PROTOTYPE((FILE *, int, unsigned char *, int, int));
-int do_prim_int PROTOTYPE((FILE *, int, unsigned char *, int, int));
-int do_prim_string PROTOTYPE((FILE *, int, unsigned char *, int, int));
-void print_tag_type PROTOTYPE((FILE *, int, int));
-int trval PROTOTYPE((FILE *, FILE *));
-int trval2 PROTOTYPE((FILE *, unsigned char *, int, int, int *));
+int decode_len (FILE *, unsigned char *, int);
+int do_prim (FILE *, int, unsigned char *, int, int);
+int do_cons (FILE *, unsigned char *, int, int, int *);
+int do_prim_bitstring (FILE *, int, unsigned char *, int, int);
+int do_prim_int (FILE *, int, unsigned char *, int, int);
+int do_prim_string (FILE *, int, unsigned char *, int, int);
+void print_tag_type (FILE *, int, int);
+int trval (FILE *, FILE *);
+int trval2 (FILE *, unsigned char *, int, int, int *);
 
 
 /****************************************************************************/