aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIgor Zlatkovic <igor@src.gnome.org>2003-06-14 16:48:26 +0000
committerIgor Zlatkovic <igor@src.gnome.org>2003-06-14 16:48:26 +0000
commit72f92a882ca023963ebe712d2048a5b4fc0bf4a0 (patch)
tree3924226fc524e8c8c9c99212cc988c15bc467189 /include
parentd7cec926292b83b46af271285b0a305e99f66cd0 (diff)
downloadandroid_external_libxml2-72f92a882ca023963ebe712d2048a5b4fc0bf4a0.tar.gz
android_external_libxml2-72f92a882ca023963ebe712d2048a5b4fc0bf4a0.tar.bz2
android_external_libxml2-72f92a882ca023963ebe712d2048a5b4fc0bf4a0.zip
applied the BCB patch by Eric Zurcher
Diffstat (limited to 'include')
-rw-r--r--include/libxml/xmlversion.h.in4
-rw-r--r--include/win32config.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index 94def180..65c96bf1 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -76,7 +76,7 @@ extern void xmlCheckVersion(int version);
* Whether the thread support is configured in
*/
#if @WITH_THREADS@
-#if defined(_REENTRANT) || (_POSIX_C_SOURCE - 0 >= 199506L)
+#if defined(_REENTRANT) || defined(__MT__) || (_POSIX_C_SOURCE - 0 >= 199506L)
#define LIBXML_THREAD_ENABLED
#endif
#endif
@@ -241,7 +241,7 @@ extern void xmlCheckVersion(int version);
* code which links against libxml statically.
*/
#ifndef LIBXML_DLL_IMPORT
-#if (defined(_MSC_VER) || defined(__CYGWIN__)) && !defined(IN_LIBXML) && !defined(LIBXML_STATIC)
+#if (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)) && !defined(IN_LIBXML) && !defined(LIBXML_STATIC)
#define LIBXML_DLL_IMPORT __declspec(dllimport)
#else
#define LIBXML_DLL_IMPORT
diff --git a/include/win32config.h b/include/win32config.h
index 5b004798..9c75afd7 100644
--- a/include/win32config.h
+++ b/include/win32config.h
@@ -30,7 +30,7 @@
#define HAVE_ISINF
#define HAVE_ISNAN
#include <math.h>
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
/* MS C-runtime has functions which can be used in order to determine if
a given floating-point variable contains NaN, (+-)INF. These are
preferred, because floating-point technology is considered propriatary