libxml2 r3822 - in trunk: . include win32

[veillard svn gnome org]

Author: veillard
Date: Wed Mar 25 09:51:19 2009
New Revision: 3822
URL: http://svn.gnome.org/viewvc/libxml2?rev=3822&view=rev

Log:
* include/wsockcompat.h win32/Makefile.bcb xpath.c: fixes for
  Borland/CodeGear/Embarcadero compilers by Eric Zurcher
Daniel


Modified:
   trunk/ChangeLog
   trunk/include/wsockcompat.h
   trunk/win32/Makefile.bcb
   trunk/xpath.c

Modified: trunk/include/wsockcompat.h
==============================================================================
--- trunk/include/wsockcompat.h	(original)
+++ trunk/include/wsockcompat.h	Wed Mar 25 09:51:19 2009
@@ -15,6 +15,7 @@
    header when compiled with Borland C++ 6 */
 #if defined(__BORLANDC__) && !defined(__cplusplus)
 #define inline __inline
+#define _inline __inline
 #endif
 
 #include <ws2tcpip.h>

Modified: trunk/win32/Makefile.bcb
==============================================================================
--- trunk/win32/Makefile.bcb	(original)
+++ trunk/win32/Makefile.bcb	Wed Mar 25 09:51:19 2009
@@ -72,7 +72,7 @@
 # The linker and its options.
 LD = ilink32.exe
 LDFLAGS = -q -U$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
-LDFLAGS = $(LDFLAGS) -L"$(BINDIR);$(LIBPREFIX);$(LIB);$(BCB)\lib\PSdk"
+LDFLAGS = $(LDFLAGS) -L"$(BINDIR);$(LIBPREFIX);$(LIB);$(BCB)\lib;$(BCB)\lib\PSdk"
 LIBS = import32.lib
 !if "$(WITH_THREADS)" != "no" && "$(DYNRUNTIME)" == "1"
 LIBS = $(LIBS) cw32mti.lib
@@ -84,7 +84,7 @@
 LIBS = $(LIBS) cw32.lib
 !endif
 !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
-LIBS = $(LIBS) wsock32.lib
+LIBS = $(LIBS) wsock32.lib ws2_32.lib
 !endif 
 !if "$(WITH_ICONV)" == "1"
 LIBS = $(LIBS) iconvomf.lib

Modified: trunk/xpath.c
==============================================================================
--- trunk/xpath.c	(original)
+++ trunk/xpath.c	Wed Mar 25 09:51:19 2009
@@ -9022,7 +9022,7 @@
      * the index is NaN, the length is NaN, or both
      * arguments are infinity (relying on Inf + -Inf = NaN)
      */
-    if (!xmlXPathIsNaN(in + le) && !xmlXPathIsInf(in)) {
+    if (!xmlXPathIsInf(in) && !xmlXPathIsNaN(in + le)) {
         /*
          * To meet the requirements of the spec, the arguments
 	 * must be converted to integer format before