diff options
Diffstat (limited to 'main/mergesort.c')
| -rw-r--r-- | main/mergesort.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/mergesort.c b/main/mergesort.c index 886030d31..ee32abb4d 100644 --- a/main/mergesort.c +++ b/main/mergesort.c @@ -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 @@ 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); |