hyanantha Wed Jun 29 02:28:32 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main mergesort.c
Log:
removing unwanted NetWare code
http://cvs.php.net/diff.php/php-src/main/mergesort.c?r1=1.14&r2=1.14.2.1&ty=u
Index: php-src/main/mergesort.c
diff -u php-src/main/mergesort.c:1.14 php-src/main/mergesort.c:1.14.2.1
--- php-src/main/mergesort.c:1.14 Wed Feb 19 03:40:18 2003
+++ php-src/main/mergesort.c Wed Jun 29 02:28:31 2005
@@ -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.14.2.1 2005/06/29 06:28:31 hyanantha Exp $ */
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94";
@@ -66,11 +66,6 @@
#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);
static void insertionsort(u_char *a, 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
