cvs: php-src /ext/ftp ftp.c
| From: | Anantha Kesari H Y | Date: | Mon, 27 Sep 2004 14:29:55 +0000 |
| Subject: | cvs: php-src /ext/ftp ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28797@lists.php.net to get a copy of this message | ||
hyanantha Mon Sep 27 10:29:55 2004 EDT
Modified files:
/php-src/ext/ftp ftp.c
Log:
removed unwanted NEW_LIBC checks
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.104&r2=1.105&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.104 php-src/ext/ftp/ftp.c:1.105
--- php-src/ext/ftp/ftp.c:1.104 Fri Sep 17 08:44:55 2004
+++ php-src/ext/ftp/ftp.c Mon Sep 27 10:29:55 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.104 2004/09/17 12:44:55 wez Exp $ */
+/* $Id: ftp.c,v 1.105 2004/09/27 14:29:55 hyanantha Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -42,13 +42,9 @@
#ifdef USE_WINSOCK /* Modified to use Winsock (NOVSOCK2.H), atleast for now */
#include <novsock2.h>
#else
-#ifdef NEW_LIBC
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
-#else
-#include <sys/socket.h>
-#endif
#endif
#else
#ifdef HAVE_SYS_TYPES_H
@@ -77,7 +73,7 @@
#include "ext/standard/fsock.h"
/* Additional headers for NetWare */
-#if defined(NETWARE) && defined(NEW_LIBC) && !defined(USE_WINSOCK)
+#if defined(NETWARE) && !defined(USE_WINSOCK)
#include <sys/select.h>
#endif