From: Anantha Kesari H Y <hyanantha@php.net>
Date: Wed, 29 Jun 2005 06:28:31 +0000 (+0000)
Subject: removing unwanted NetWare code
X-Git-Tag: php-5.0.5RC1~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ad3be52c60cdbb84abacaf2bbecb29626a1ba91;p=php

removing unwanted NetWare code
---

diff --git a/main/mergesort.c b/main/mergesort.c
index 117f859e94..8ddd8644df 100644
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -66,11 +66,6 @@ static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #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);