commit 70a9da54eb200cd5c5ceafb72aff72c39021c94c
author Bjorn Reese <breese@src.gnome.org> Sat Apr 21 16:57:29 2001 +0000
committer Bjorn Reese <breese@src.gnome.org> Sat Apr 21 16:57:29 2001 +0000
tree f1451c927671ec62eae6b8adc65babd8ddc88251
parent 34b1b3a81ed88ad9885be382327e4be10364c01a

trio upgrade and integration

nanoftp.c

diff --git a/nanoftp.c b/nanoftp.c
index d7cc0a6..050b8b0 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -12,19 +12,19 @@
 #define HAVE_NETINET_IN_H
 #define HAVE_NETDB_H
 #define HAVE_SYS_TIME_H
-#else /* STANDALONE */
-#ifdef WIN32
-#define INCLUDE_WINSOCK
-#include "win32config.h"
+#include <libxml/xmlversion.h>
+#ifdef WITHOUT_TRIO
+#include <stdio.h>
 #else
-#include "config.h"
+#define TRIO_REPLACE_STDIO
+#include "trio.h"
 #endif
+#else /* STANDALONE */
+#include "libxml.h"
 #endif /* STANDALONE */
 
-#include <libxml/xmlversion.h>
 
 #ifdef LIBXML_FTP_ENABLED
-#include <stdio.h>
 #include <string.h>
 
 #ifdef HAVE_STDLIB_H