cvs: php4 /ext/ircg ircg.c

sas Tue Jul 17 22:03:02 2001 EDT Modified files: /php4/ext/ircg ircg.c Log: Support IRCG 2.x Partly submitted by: Oliver Lehmann <lehmann@ans-netz.de> Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.83 php4/ext/ircg/ircg.c:1.84 --- php4/ext/ircg/ircg.c:1.83 Mon Jul 9 13:49:19 2001 +++ php4/ext/ircg/ircg.c Tue Jul 17 22:03:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.83 2001/07/09 17:49:19 sas Exp $ */ +/* $Id: ircg.c,v 1.84 2001/07/18 02:03:02 sas Exp $ */ #include <time.h> @@ -261,7 +261,9 @@ } conn->fd = -2; zend_hash_index_del(&h_irconn, conn->irconn_id); +#if IRCG_API_VERSION >= 20010601 c->magic = NULL; +#endif zend_hash_destroy(&conn->ctcp_msgs); if (conn->buffer.c) smart_str_free_ex(&conn->buffer, 1); @@ -571,7 +573,13 @@ case -1: /* No message window yet. Buffer */ if (conn->buffer_count++ > 30) { smart_str_free_ex(msg, 1); - if ((ircg_now_time_t - conn->login) > 240) + if (( +#if IRCG_API_VERSION >= 20010601 + ircg_now_time_t +#else + time(NULL) +#endif + - conn->login) > 240) irc_disconnect(&conn->conn, "Timed out waiting for window"); return; }