Changeset 8e419cb for protocols/ssl_nss.c

Timestamp:

2006-01-10T21:35:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

File:

• protocols/ssl_nss.c (modified) (2 diffs)

protocols/ssl_nss.c

@@ -45 +45 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
@@ -91 +91 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );