diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/libxml/threads.h | 4 | ||||
| -rw-r--r-- | include/libxml/uri.h | 7 | ||||
| -rw-r--r-- | include/libxml/xmlversion.h | 11 | ||||
| -rw-r--r-- | include/libxml/xmlversion.h.in | 3 | ||||
| -rw-r--r-- | include/win32config.h | 9 |
5 files changed, 25 insertions, 9 deletions
diff --git a/include/libxml/threads.h b/include/libxml/threads.h index 4f7d10f..f81f982 100644 --- a/include/libxml/threads.h +++ b/include/libxml/threads.h @@ -72,6 +72,10 @@ XMLPUBFUN void XMLCALL XMLPUBFUN xmlGlobalStatePtr XMLCALL xmlGetGlobalState(void); +#if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && defined(LIBXML_STATIC_FOR_DLL) +int XMLCALL xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved); +#endif + #ifdef __cplusplus } #endif diff --git a/include/libxml/uri.h b/include/libxml/uri.h index 5e29671..49ed105 100644 --- a/include/libxml/uri.h +++ b/include/libxml/uri.h @@ -23,6 +23,10 @@ extern "C" { * * A parsed URI reference. This is a struct containing the various fields * as described in RFC 2396 but separated for further processing. + * + * Note: query is a deprecated field which is incorrectly unescaped. + * query_raw takes precedence over query if the former is set. + * See: http://mail.gnome.org/archives/xml/2007-April/thread.html#00127 */ typedef struct _xmlURI xmlURI; typedef xmlURI *xmlURIPtr; @@ -34,9 +38,10 @@ struct _xmlURI { char *user; /* the user part */ int port; /* the port number */ char *path; /* the path string */ - char *query; /* the query string */ + char *query; /* the query string (deprecated - use with caution) */ char *fragment; /* the fragment identifier */ int cleanup; /* parsing potentially unclean URI */ + char *query_raw; /* the query string (as it appears in the URI) */ }; /* diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h index 6eee895..78bad60 100644 --- a/include/libxml/xmlversion.h +++ b/include/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.6.28" +#define LIBXML_DOTTED_VERSION "2.6.29" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 20628 +#define LIBXML_VERSION 20629 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "20628" +#define LIBXML_VERSION_STRING "20629" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20628); +#define LIBXML_TEST_VERSION xmlCheckVersion(20629); #ifndef VMS #if 0 @@ -91,7 +91,8 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Whether the thread support is configured in */ #if 1 -#if defined(_REENTRANT) || defined(__MT__) || (_POSIX_C_SOURCE - 0 >= 199506L) +#if defined(_REENTRANT) || defined(__MT__) || \ + (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) #define LIBXML_THREAD_ENABLED #endif #endif diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in index 0967913..29cef74 100644 --- a/include/libxml/xmlversion.h.in +++ b/include/libxml/xmlversion.h.in @@ -91,7 +91,8 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Whether the thread support is configured in */ #if @WITH_THREADS@ -#if defined(_REENTRANT) || defined(__MT__) || (_POSIX_C_SOURCE - 0 >= 199506L) +#if defined(_REENTRANT) || defined(__MT__) || \ + (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) #define LIBXML_THREAD_ENABLED #endif #endif diff --git a/include/win32config.h b/include/win32config.h index c61dfa9..6e9b33b 100644 --- a/include/win32config.h +++ b/include/win32config.h @@ -6,7 +6,7 @@ #define HAVE_MALLOC_H #define HAVE_ERRNO_H -#ifdef _WIN32_WCE +#if defined(_WIN32_WCE) #undef HAVE_ERRNO_H #include <windows.h> #include "wincecompat.h" @@ -27,6 +27,11 @@ #include <wsockcompat.h> #endif +/* + * Windows platforms may define except + */ +#undef except + #define HAVE_ISINF #define HAVE_ISNAN #include <math.h> @@ -95,7 +100,7 @@ static int isnan (double d) { /* Threading API to use should be specified here for compatibility reasons. This is however best specified on the compiler's command-line. */ #if defined(LIBXML_THREAD_ENABLED) -#if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) +#if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) && !defined(_WIN32_WCE) #define HAVE_WIN32_THREADS #endif #endif |