summaryrefslogtreecommitdiff
path: root/nanoftp.c
diff options
context:
space:
mode:
authorMike Hommey <glandium@debian.org>2005-04-04 18:23:13 +0000
committerMike Hommey <glandium@debian.org>2005-04-04 18:23:13 +0000
commit0fc063df3ab2ad380d532d210dd1001de473e51b (patch)
tree6f88f0a0f845dd6aec7807b18cb5618d93e159ac /nanoftp.c
parent50e5b428562964b1eb2f876370058b34b47c5e90 (diff)
downloadlibxml2-0fc063df3ab2ad380d532d210dd1001de473e51b.tar.gz
Load /tmp/tmp.98zkCi/libxml2-2.6.19 intoupstream/2.6.19
packages/libxml2/branches/upstream/current.
Diffstat (limited to 'nanoftp.c')
-rw-r--r--nanoftp.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/nanoftp.c b/nanoftp.c
index ac0c2f0..e4319cf 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -81,8 +81,8 @@
#define _WINSOCKAPI_
#include <wsockcompat.h>
#include <winsock2.h>
-#undef SOCKLEN_T
-#define SOCKLEN_T unsigned int
+#undef XML_SOCKLEN_T
+#define XML_SOCKLEN_T unsigned int
#endif
/**
@@ -95,7 +95,7 @@
#define SOCKET int
#endif
#if defined(VMS) || defined(__VMS)
-#define SOCKLEN_T unsigned int
+#define XML_SOCKLEN_T unsigned int
#endif
#ifdef __BEOS__
@@ -1372,7 +1372,7 @@ xmlNanoFTPGetConnection(void *ctx) {
#else
struct sockaddr_in dataAddr;
#endif
- SOCKLEN_T dataAddrLen;
+ XML_SOCKLEN_T dataAddrLen;
if (ctxt == NULL) return(-1);
@@ -2104,3 +2104,5 @@ int main(int argc, char **argv) {
}
#endif /* STANDALONE */
#endif /* LIBXML_FTP_ENABLED */
+#define bottom_nanoftp
+#include "elfgcchack.h"