diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-04-27 14:02:19 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-04-27 14:02:19 +0000 |
| commit | f25d617b278aa214f0bb68cd2ebb841861186025 (patch) | |
| tree | e523c3de25fed415f101cae4547f615e0bd2fa37 /src | |
| parent | a54b8b18cb71aa2853ad88893dc1c47fce477de1 (diff) | |
| download | krb5-f25d617b278aa214f0bb68cd2ebb841861186025.tar.gz krb5-f25d617b278aa214f0bb68cd2ebb841861186025.tar.xz krb5-f25d617b278aa214f0bb68cd2ebb841861186025.zip | |
* ftp_var.h: Prototype for recvrequest() needs volatile
declaration to match code. Native Dec Alpha compiler errors on the
inconsistancy.
* secure.h (PROTOTYPE): Only define if not defined already.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13214 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/gssftp/ftp/ChangeLog | 8 | ||||
| -rw-r--r-- | src/appl/gssftp/ftp/ftp_var.h | 4 | ||||
| -rw-r--r-- | src/appl/gssftp/ftp/secure.h | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index b23f1d4a9..7c915b1a7 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,11 @@ +2001-04-27 Ezra Peisach <epeisach@mit.edu> + + * ftp_var.h: Prototype for recvrequest() needs volatile + declaration to match code. Native Dec Alpha compiler errors on the + inconsistancy. + + * secure.h (PROTOTYPE): Only define if not defined already. + 2001-04-26 Ken Raeburn <raeburn@mit.edu> * ftp_var.h (PROTOTYPE): Always define to use supplied prototype. diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h index 7bdc51f07..67b187c01 100644 --- a/src/appl/gssftp/ftp/ftp_var.h +++ b/src/appl/gssftp/ftp/ftp_var.h @@ -141,7 +141,9 @@ extern char *mktemp(); extern int command(char *, ...); #endif +#ifndef PROTOTYPE #define PROTOTYPE(x) x +#endif char *remglob PROTOTYPE((char **, int)); int another PROTOTYPE((int *, char ***, char *)); @@ -217,7 +219,7 @@ void setpassive PROTOTYPE((void)); /* ftp.c */ void sendrequest PROTOTYPE((char *, char *, char *, int)); -void recvrequest PROTOTYPE((char *, char *, char *, char *, int)); +void recvrequest PROTOTYPE((char *, char *volatile, char *, char *, int)); int login PROTOTYPE((char *)); void setpbsz PROTOTYPE((unsigned int)); void pswitch PROTOTYPE((int)); diff --git a/src/appl/gssftp/ftp/secure.h b/src/appl/gssftp/ftp/secure.h index 6a4ee4c99..8a2a519f4 100644 --- a/src/appl/gssftp/ftp/secure.h +++ b/src/appl/gssftp/ftp/secure.h @@ -5,7 +5,9 @@ #define myaddr data_addr #define hisaddr hisdataaddr +#ifndef PROTOTYPE #define PROTOTYPE(x) x +#endif int secure_flush PROTOTYPE((int)); int secure_putc PROTOTYPE((int, FILE *)); |