cvs: php4 /ext/ircg ircg.c

sas Sun Sep 9 10:31:37 2001 EDT Modified files: /php4/ext/ircg ircg.c Log: Remove unneccessary preprocessor checks Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.108 php4/ext/ircg/ircg.c:1.109 --- php4/ext/ircg/ircg.c:1.108 Sun Sep 9 09:28:54 2001 +++ php4/ext/ircg/ircg.c Sun Sep 9 10:31:36 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.108 2001/09/09 13:28:54 derick Exp $ */ +/* $Id: ircg.c,v 1.109 2001/09/09 14:31:36 sas Exp $ */ #include <time.h> @@ -110,7 +110,7 @@ #include "if_irc.h" #include "irc_write_buffer.h" -#if !defined(IRCG_API_VERSION) || IRCG_API_VERSION < 20010303 +#if IRCG_API_VERSION - 0 < 20010303 # error "Please upgrade to at least IRCG 2.0b1" #endif @@ -607,11 +607,11 @@ smart_str_free_ex(msg, 1); break; default: -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010601 +#if IRCG_API_VERSION - 0 >= 20010601 if (irc_write_buf_append_ex(&conn->wb, msg, 0)) { irc_disconnect(&conn->conn, "Write to HTTP client failed"); } -#elif defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010302 +#elif IRCG_API_VERSION - 0 >= 20010302 irc_write_buf_append_ex(&conn->wb, msg, 0); #else irc_write_buf_append(&conn->wb, msg); @@ -1166,7 +1166,7 @@ PHP_FUNCTION(ircg_whois) { -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010227 +#if IRCG_API_VERSION - 0 >= 20010227 zval **p1, **p2; php_irconn_t *conn; @@ -1189,7 +1189,7 @@ */ PHP_FUNCTION(ircg_ignore_add) { -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010402 +#if IRCG_API_VERSION - 0 >= 20010402 zval **args[2]; php_irconn_t *conn; smart_str s; @@ -1236,7 +1236,7 @@ */ PHP_FUNCTION(ircg_ignore_del) { -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010402 +#if IRCG_API_VERSION - 0 >= 20010402 zval **args[2]; php_irconn_t *conn; smart_str s; @@ -1262,7 +1262,7 @@ */ PHP_FUNCTION(ircg_channel_mode) { -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010227 +#if IRCG_API_VERSION - 0 >= 20010227 zval **args[4]; php_irconn_t *conn; @@ -1288,7 +1288,7 @@ */ PHP_FUNCTION(ircg_topic) { -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010226 +#if IRCG_API_VERSION - 0 >= 20010226 zval **p1, **p2, **p3; php_irconn_t *conn; @@ -1345,7 +1345,7 @@ */ PHP_FUNCTION(ircg_kick) { -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010226 +#if IRCG_API_VERSION - 0 >= 20010226 zval **p1, **p2, **p3, **p4; php_irconn_t *conn; @@ -1484,7 +1484,7 @@ irc_set_password(conn, &m); } -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010225 +#if IRCG_API_VERSION - 0 >= 20010225 if (irconn->realname) { smart_str m; smart_str_sets(&m, irconn->realname); @@ -1506,7 +1506,7 @@ IFMSG(FMT_MSG_QUIT, IRCG_USER_QUIT, user_quit); IFMSG(FMT_MSG_TOPIC, IRCG_TOPIC, new_topic); -#if defined(IRCG_API_VERSION) && IRCG_API_VERSION >= 20010227 +#if IRCG_API_VERSION - 0 >= 20010227 irc_register_hook(conn, IRCG_WHOISUSER, whois_user_handler); irc_register_hook(conn, IRCG_WHOISSERVER, whois_server_handler); irc_register_hook(conn, IRCG_WHOISIDLE, whois_idle_handler);