diff options
| author | Tom Yu <tlyu@mit.edu> | 2001-07-24 04:04:56 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2001-07-24 04:04:56 +0000 |
| commit | dcb95eda96604c1cf577585d2d067017afbae276 (patch) | |
| tree | c1b2e1cdee6c36f3db6f01b86b59091d3313cb69 /src | |
| parent | 548198e160e3411194cc3f276b483f431935d3e1 (diff) | |
| download | krb5-dcb95eda96604c1cf577585d2d067017afbae276.tar.gz krb5-dcb95eda96604c1cf577585d2d067017afbae276.tar.xz krb5-dcb95eda96604c1cf577585d2d067017afbae276.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/gssftp/ftp/ChangeLog | 7 | ||||
| -rw-r--r-- | src/appl/gssftp/ftp/ftp_var.h | 2 | ||||
| -rw-r--r-- | src/appl/gssftp/ftp/getpass.c | 4 |
3 files changed, 8 insertions, 5 deletions
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; |