hyanantha Thu Oct 24 07:26:31 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/main mergesort.c
Log:
NetWare related changes/modifications.
Index: php4/main/mergesort.c
diff -u php4/main/mergesort.c:1.11 php4/main/mergesort.c:1.11.2.1
--- php4/main/mergesort.c:1.11 Mon Sep 17 17:02:53 2001
+++ php4/main/mergesort.c Thu Oct 24 07:26:31 2002
@@ -64,6 +64,11 @@
#include <winsock.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
