summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1995-05-09 02:58:25 +0000
committerEzra Peisach <epeisach@mit.edu>1995-05-09 02:58:25 +0000
commit2b52260c2f933524399f52d31a7553b0e7078482 (patch)
tree38bcc239ca9b19d9c217f5b4269d6f160bfccba4 /src
parentcae931d3d1767d75ab0ac8c9cef76a97c2bc5e2b (diff)
downloadkrb5-2b52260c2f933524399f52d31a7553b0e7078482.tar.gz
krb5-2b52260c2f933524399f52d31a7553b0e7078482.tar.xz
krb5-2b52260c2f933524399f52d31a7553b0e7078482.zip
configure.in: Add HAS_ANSI_VOLATILE
read_pwd.c: Let autoconf decide if volatile doesn't exist. Assume exists for everyone else. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5761 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/os/ChangeLog6
-rw-r--r--src/lib/krb5/os/configure.in1
-rw-r--r--src/lib/krb5/os/read_pwd.c5
3 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index d7f2ba158..7dbd64372 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,5 +1,11 @@
Mon May 8 22:19:23 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
+ * read_pwd.c (krb5_read_password): use volatile on all
+ systems. Let configure define volatile to nothing on
+ systems without.
+
+ * configure.in: Add HAS_ANSI_VOLATILE
+
* mk_faddr.c (krb5_make_fulladdr): Allocate enough memory for
raddr contents.
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index fed493990..4bac2beb1 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -8,6 +8,7 @@ dnl and gmt_mktime.c (which only gets them from here...)
AC_TIME_WITH_SYS_TIME
AC_HAVE_HEADERS(unistd.h sys/time.h)
AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
+HAS_ANSI_VOLATILE
SubdirLibraryRule([${OBJS}])
KRB_INCLUDE
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 0b29e69b0..7107f119e 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -81,11 +81,8 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
int *size_return;
{
/* adapted from Kerberos v4 des/read_password.c */
-#if defined(__STDC__) || defined(mips) || defined(_WINDOWS)
/* readin_string is used after a longjmp, so must be volatile */
- volatile
-#endif
- char *readin_string = 0;
+ volatile char *readin_string = 0;
register char *ptr;
int scratchchar;
krb5_sigtype (*ointrfunc)();