* 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

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index b23f1d4a9ab8d40dd9425c6e47d9a86b35dd2998..7c915b1a79cc0c0a8160d250087970ccbd4df199 100644 (file)
--- 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 7bdc51f079b1b0681b6a5a6c6bd186e8f020128e..67b187c0153b7126b92eb598b6e695e335eb0008 100644 (file)
--- 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 6a4ee4c99861e80e33d3b32125e555db80f96090..8a2a519f407305760b25bbcce5b37d713823ee3b 100644 (file)
--- 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 *));