From: Tom Yu <tlyu@mit.edu>
Date: Tue, 24 Jul 2001 04:04:56 +0000 (+0000)
Subject: 	* getpass.c: Remove duplicate definitions of sig_t, my_sig_t;
X-Git-Tag: krb5-1.3-alpha1~1180
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dcb95eda96604c1cf577585d2d067017afbae276;p=krb5.git

	* getpass.c: Remove duplicate definitions of sig_t, my_sig_t;
	they're already declared in ftp_var.h.

	* ftp_var.h (FDOPEN_SOCKET): Fix second arg.

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

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 868f0a579..d80ada789 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-24  Tom Yu  <tlyu@mit.edu>
+
+	* getpass.c: Remove duplicate definitions of sig_t, my_sig_t;
+	they're already declared in ftp_var.h.
+
+	* ftp_var.h (FDOPEN_SOCKET): Fix second arg.
+
 2001-07-23  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in, cmds.c, ftp.c, ftp_var.h, getpass.c, glob.c,
diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h
index ee02ed314..0f95ca42c 100644
--- a/src/appl/gssftp/ftp/ftp_var.h
+++ b/src/appl/gssftp/ftp/ftp_var.h
@@ -46,7 +46,7 @@ FILE* fdopen_socket(SOCKET s, char* mode);
 #define PERROR_SOCKET(str) do { errno = SOCKET_ERRNO; perror(str); } while(0)
 #else
 #define FCLOSE_SOCKET(f) fclose(f)
-#define FDOPEN_SOCKET(s, mode) fdopen(s, fd)
+#define FDOPEN_SOCKET(s, mode) fdopen(s, mode)
 #define SOCKETNO(fd) (fd)
 #define PERROR_SOCKET(str) perror(str)
 #endif
diff --git a/src/appl/gssftp/ftp/getpass.c b/src/appl/gssftp/ftp/getpass.c
index 3f2500481..cd27cdce5 100644
--- a/src/appl/gssftp/ftp/getpass.c
+++ b/src/appl/gssftp/ftp/getpass.c
@@ -106,10 +106,6 @@ static	struct sgttyb ttyo, ttyb;
 
 static	FILE *fi;
 
-#define sig_t my_sig_t
-#define sigtype krb5_sigtype
-typedef sigtype (*sig_t)();
-
 static sigtype
 intfix(sig)
 	int sig;