diff options
author | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
commit | dce7b34b9f70d28161082e6187c5cb6ea4079060 (patch) | |
tree | b3b63b028dfc4e4853f71339390eea6fb3f6cc24 /tools/plink/sshgss.h | |
parent | 6ba4c534507676abe7d7ac415cb113cd40953925 (diff) | |
parent | 6039fd0faf73c9d6c5b2abf9d824734218ec5eee (diff) | |
download | vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.gz vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.bz2 vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
tools/plink/sshbn.c
Diffstat (limited to 'tools/plink/sshgss.h')
-rw-r--r-- | tools/plink/sshgss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/plink/sshgss.h b/tools/plink/sshgss.h index 5d8fca1b7..61f35a299 100644 --- a/tools/plink/sshgss.h +++ b/tools/plink/sshgss.h @@ -47,7 +47,7 @@ struct ssh_gss_liblist { struct ssh_gss_library *libraries;
int nlibraries;
};
-struct ssh_gss_liblist *ssh_gss_setup(const Config *cfg);
+struct ssh_gss_liblist *ssh_gss_setup(Conf *conf);
void ssh_gss_cleanup(struct ssh_gss_liblist *list);
/*
|