diff lib/sslcommon.c @ 210:82ebd1b05345

2003-7-6 Brian Masney <[e-mail]> * lib/pty.c lib/gftp.h - added gftp_exec_with_new_pty() and gftp_exec_without_new_pty() * lib/sshv2.c - use the 2 new functions above * lib/pty.c lib/gftp.h - split open_ptys() to _gftp_ptym_open() and _gftp_ptys_open() * lib/sslcommon.c - don't do thread setup if we are compiling against glib 1.2. I do not want to link against the pthread library because that would make the text port dependant on pthreads being installed on the box

--- a/lib/sslcommon.c	Sat Jul 05 17:30:14 2003 +0000
+++ b/lib/sslcommon.c	Sun Jul 06 13:52:43 2003 +0000
@@ -206,7 +206,8 @@
 #if GLIB_MAJOR_VERSION > 1
   return ((unsigned long) g_thread_self ());
 #else
-  /* FIXME _ call pthread version */
+  /* FIXME _ call pthread version. Once this is done, the #ifdef below can be
+     removed */
   return (0);
 #endif
 } 
@@ -248,6 +249,11 @@
 {
   int i;
 
+#ifdef G_MAJOR_VERSION == 1
+  /* Thread setup isn't supported in glib 1.2 yet */
+  return;
+#endif
+
   gftp_ssl_mutexes = g_malloc (CRYPTO_num_locks( ) * sizeof (*gftp_ssl_mutexes));
 
   for (i = 0; i < CRYPTO_num_locks ( ); i++)