hyanantha Thu Sep 23 11:57:30 2004 EDT Modified files: /php-src/main mergesort.c Log: removed unwanted NetWare specific changes http://cvs.php.net/diff.php/php-src/main/mergesort.c?r1=1.14&r2=1.15&ty=u Index: php-src/main/mergesort.c diff -u php-src/main/mergesort.c:1.14 php-src/main/mergesort.c:1.15 --- php-src/main/mergesort.c:1.14 Wed Feb 19 03:40:18 2003 +++ php-src/main/mergesort.c Thu Sep 23 11:57:30 2004 @@ -34,7 +34,7 @@ * SUCH DAMAGE. */ -/* $Id: mergesort.c,v 1.14 2003/02/19 08:40:18 sniper Exp $ */ +/* $Id: mergesort.c,v 1.15 2004/09/23 15:57:30 hyanantha Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94"; @@ -64,11 +64,6 @@ #ifdef PHP_WIN32 #include <winsock2.h> /* Includes definition for u_char */ -#endif - -#if defined(NETWARE) && !defined(NEW_LIBC) -/*#include <ws2nlm.h>*/ -#include <sys/socket.h> #endif static void setup(u_char *list1, u_char *list2, size_t n, size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php