Commit 648b8e97 authored by Igor Zlatkovic's avatar Igor Zlatkovic
Browse files

*** empty log message ***

parent b509f154
Wed Apr 17 20:34:37 CEST 2002 Igor Zlatkovic <igor@stud.fh-frankfurt.de>
* include/libxml/tree.h: eliminated 'declaration different than
prototype' warning
* include/win32config.h: "resolved" conflicts with errno.h
Wed Apr 17 18:26:07 CEST 2002 Daniel Veillard <daniel@veillard.com>
* xmlregexp.c xmlschemas.c include/libxml/xmlautomata.h: more work
......
......@@ -644,10 +644,10 @@ xmlNodePtr xmlNewReference (xmlDocPtr doc,
const xmlChar *name);
xmlNodePtr xmlCopyNode (const xmlNodePtr node,
int recursive);
xmlNodePtr xmlDocCopyNode (xmlNodePtr node,
xmlNodePtr xmlDocCopyNode (const xmlNodePtr node,
xmlDocPtr doc,
int recursive);
xmlNodePtr xmlCopyNodeList (xmlNodePtr node);
xmlNodePtr xmlCopyNodeList (const xmlNodePtr node);
xmlNodePtr xmlNewDocFragment (xmlDocPtr doc);
/*
......
......@@ -10,10 +10,13 @@
#include <io.h>
#define SOCKLEN_T int
#ifdef NEED_SOCKETS
#include <winsock2.h>
#if !defined SOCKLEN_T
#define SOCKLEN_T int
#endif
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EINPROGRESS WSAEINPROGRESS
#define EALREADY WSAEALREADY
......@@ -42,16 +45,21 @@
#define ETIMEDOUT WSAETIMEDOUT
#define ECONNREFUSED WSAECONNREFUSED
#define ELOOP WSAELOOP
#define ENAMETOOLONG WSAENAMETOOLONG
#define EHOSTDOWN WSAEHOSTDOWN
#define EHOSTUNREACH WSAEHOSTUNREACH
#define ENOTEMPTY WSAENOTEMPTY
#define EPROCLIM WSAEPROCLIM
#define EUSERS WSAEUSERS
#define EDQUOT WSAEDQUOT
#define ESTALE WSAESTALE
#define EREMOTE WSAEREMOTE
#endif /* INCLUDE_WINSOCK */
/* These cause conflicts with the codes from errno.h. Since they are
not used in the relevant code (nanoftp, nanohttp), we can leave
them disabled.
#define ENAMETOOLONG WSAENAMETOOLONG
#define ENOTEMPTY WSAENOTEMPTY
*/
#endif /* NEED_SOCKETS */
#define HAVE_ISINF
#define HAVE_ISNAN
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment