diff -crN ./libxml2/Makefile.am /users3/olivap/sb/p64/src/./libxml2/Makefile.am
*** ./libxml2/Makefile.am	Mon Aug 22 14:48:34 2005
--- /users3/olivap/sb/p64/src/./libxml2/Makefile.am	Tue Sep 27 16:47:21 2005
***************
*** 17,23 ****
  lib_LTLIBRARIES = libxml2.la
  libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
  
! libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@ @MODULE_PLATFORM_LIBS@
  
  if WITH_TRIO_SOURCES
  libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
--- 17,23 ----
  lib_LTLIBRARIES = libxml2.la
  libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
  
! libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@  $(LDFLAGS) -version-info @LIBXML_VERSION_INFO@ @MODULE_PLATFORM_LIBS@
  
  if WITH_TRIO_SOURCES
  libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
***************
*** 61,117 ****
  runsuite_LDADD= @RDL_LIBS@ $(LDADDS)
  
  xmllint_SOURCES=xmllint.c
! xmllint_LDFLAGS = 
  xmllint_DEPENDENCIES = $(DEPS)
  xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
  
  testSAX_SOURCES=testSAX.c
! testSAX_LDFLAGS = 
  testSAX_DEPENDENCIES = $(DEPS)
  testSAX_LDADD= $(LDADDS)
  
  testHTML_SOURCES=testHTML.c
! testHTML_LDFLAGS = 
  testHTML_DEPENDENCIES = $(DEPS)
  testHTML_LDADD= $(LDADDS)
  
  xmlcatalog_SOURCES=xmlcatalog.c
! xmlcatalog_LDFLAGS = 
  xmlcatalog_DEPENDENCIES = $(DEPS)
  xmlcatalog_LDADD= @RDL_LIBS@ $(LDADDS)
  
  testXPath_SOURCES=testXPath.c
! testXPath_LDFLAGS = 
  testXPath_DEPENDENCIES = $(DEPS)
  testXPath_LDADD= $(LDADDS)
  
  testC14N_SOURCES=testC14N.c
! testC14N_LDFLAGS = 
  testC14N_DEPENDENCIES = $(DEPS)
  testC14N_LDADD= $(LDADDS)
  
  testThreads_SOURCES=testThreads@THREADS_W32@.c
! testThreads_LDFLAGS = 
  testThreads_DEPENDENCIES = $(DEPS)
  testThreads_LDADD= @BASE_THREAD_LIBS@  $(LDADDS)
  
  testURI_SOURCES=testURI.c
! testURI_LDFLAGS = 
  testURI_DEPENDENCIES = $(DEPS)
  testURI_LDADD= $(LDADDS)
  
  testRegexp_SOURCES=testRegexp.c
! testRegexp_LDFLAGS = 
  testRegexp_DEPENDENCIES = $(DEPS)
  testRegexp_LDADD= $(LDADDS)
  
  testAutomata_SOURCES=testAutomata.c
! testAutomata_LDFLAGS = 
  testAutomata_DEPENDENCIES = $(DEPS)
  testAutomata_LDADD= $(LDADDS)
  
  testSchemas_SOURCES=testSchemas.c
! testSchemas_LDFLAGS = 
  testSchemas_DEPENDENCIES = $(DEPS)
  testSchemas_LDADD= $(LDADDS)
  
--- 61,117 ----
  runsuite_LDADD= @RDL_LIBS@ $(LDADDS)
  
  xmllint_SOURCES=xmllint.c
! xmllint_LDFLAGS = $(LDFLAGS)
  xmllint_DEPENDENCIES = $(DEPS)
  xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
  
  testSAX_SOURCES=testSAX.c
! testSAX_LDFLAGS = $(LDFLAGS)
  testSAX_DEPENDENCIES = $(DEPS)
  testSAX_LDADD= $(LDADDS)
  
  testHTML_SOURCES=testHTML.c
! testHTML_LDFLAGS = $(LDFLAGS)
  testHTML_DEPENDENCIES = $(DEPS)
  testHTML_LDADD= $(LDADDS)
  
  xmlcatalog_SOURCES=xmlcatalog.c
! xmlcatalog_LDFLAGS = $(LDFLAGS)
  xmlcatalog_DEPENDENCIES = $(DEPS)
  xmlcatalog_LDADD= @RDL_LIBS@ $(LDADDS)
  
  testXPath_SOURCES=testXPath.c
! testXPath_LDFLAGS = $(LDFLAGS)
  testXPath_DEPENDENCIES = $(DEPS)
  testXPath_LDADD= $(LDADDS)
  
  testC14N_SOURCES=testC14N.c
! testC14N_LDFLAGS = $(LDFLAGS)
  testC14N_DEPENDENCIES = $(DEPS)
  testC14N_LDADD= $(LDADDS)
  
  testThreads_SOURCES=testThreads@THREADS_W32@.c
! testThreads_LDFLAGS = $(LDFLAGS)
  testThreads_DEPENDENCIES = $(DEPS)
  testThreads_LDADD= @BASE_THREAD_LIBS@  $(LDADDS)
  
  testURI_SOURCES=testURI.c
! testURI_LDFLAGS = $(LDFLAGS)
  testURI_DEPENDENCIES = $(DEPS)
  testURI_LDADD= $(LDADDS)
  
  testRegexp_SOURCES=testRegexp.c
! testRegexp_LDFLAGS = $(LDFLAGS)
  testRegexp_DEPENDENCIES = $(DEPS)
  testRegexp_LDADD= $(LDADDS)
  
  testAutomata_SOURCES=testAutomata.c
! testAutomata_LDFLAGS = $(LDFLAGS)
  testAutomata_DEPENDENCIES = $(DEPS)
  testAutomata_LDADD= $(LDADDS)
  
  testSchemas_SOURCES=testSchemas.c
! testSchemas_LDFLAGS = $(LDFLAGS)
  testSchemas_DEPENDENCIES = $(DEPS)
  testSchemas_LDADD= $(LDADDS)
  
***************
*** 121,127 ****
  testRelax_LDADD= $(LDADDS)
  
  testReader_SOURCES=testReader.c
! testReader_LDFLAGS = 
  testReader_DEPENDENCIES = $(DEPS)
  testReader_LDADD= $(LDADDS)
  
--- 121,127 ----
  testRelax_LDADD= $(LDADDS)
  
  testReader_SOURCES=testReader.c
! testReader_LDFLAGS = $(LDFLAGS)
  testReader_DEPENDENCIES = $(DEPS)
  testReader_LDADD= $(LDADDS)
  
diff -crN ./libxml2/nanoftp.c /users3/olivap/sb/p64/src/./libxml2/nanoftp.c
*** ./libxml2/nanoftp.c	Mon Aug  8 22:28:51 2005
--- /users3/olivap/sb/p64/src/./libxml2/nanoftp.c	Tue Sep 27 16:47:21 2005
***************
*** 4,9 ****
--- 4,10 ----
   *  Reference: RFC 959
   */
  
+ #define AIX_IP6_DEF 
  #ifdef TESTING
  #define STANDALONE
  #define HAVE_STDLIB_H
***************
*** 1379,1385 ****
--- 1380,1390 ----
  
      memset (&dataAddr, 0, sizeof(dataAddr));
  #ifdef SUPPORT_IP6
+  #ifdef AIX_IP6_DEF /* modification temporaire JNC */
+     if ((ctxt->ftpAddr).__ss_family == AF_INET6) {
+  #else 
      if ((ctxt->ftpAddr).ss_family == AF_INET6) {
+  #endif
  	ctxt->dataFd = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
  	((struct sockaddr_in6 *)&dataAddr)->sin6_family = AF_INET6;
  	dataAddrLen = sizeof(struct sockaddr_in6);
***************
*** 1398,1404 ****
--- 1403,1413 ----
  
      if (ctxt->passive) {
  #ifdef SUPPORT_IP6
+  #ifdef AIX_IP6_DEF /* modification temporaire JNC */
+ 	if ((ctxt->ftpAddr).__ss_family == AF_INET6)
+  #else
  	if ((ctxt->ftpAddr).ss_family == AF_INET6)
+  #endif	
  	    snprintf (buf, sizeof(buf), "EPSV\r\n");
  	else
  #endif
***************
*** 1429,1435 ****
--- 1438,1448 ----
  	cur = &ctxt->controlBuf[ctxt->controlBufAnswer]; 
  	while (((*cur < '0') || (*cur > '9')) && *cur != '\0') cur++;
  #ifdef SUPPORT_IP6
+  #ifdef AIX_IP6_DEF /* modification temporaire JNC */
+ 	if ((ctxt->ftpAddr).__ss_family == AF_INET6) {
+  #else
  	if ((ctxt->ftpAddr).ss_family == AF_INET6) {
+  #endif
  	    if (sscanf (cur, "%u", &temp[0]) != 1) {
  		__xmlIOErr(XML_FROM_FTP, XML_FTP_EPSV_ANSWER,
  			"Invalid answer to EPSV\n");
***************
*** 1466,1472 ****
--- 1479,1489 ----
      } else {
          getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr, &dataAddrLen);
  #ifdef SUPPORT_IP6
+  #ifdef AIX_IP6_DEF /* modification temporaire JNC */
+ 	if ((ctxt->ftpAddr).__ss_family == AF_INET6)
+  #else
  	if ((ctxt->ftpAddr).ss_family == AF_INET6)
+  #endif
  	    ((struct sockaddr_in6 *)&dataAddr)->sin6_port = 0;
  	else
  #endif
***************
*** 1485,1491 ****
--- 1502,1512 ----
  	    return (-1);
  	}
  #ifdef SUPPORT_IP6
+  #ifdef AIX_IP6_DEF /* modification temporaire JNC */
+ 	if ((ctxt->ftpAddr).__ss_family == AF_INET6) {
+  #else
  	if ((ctxt->ftpAddr).ss_family == AF_INET6) {
+  #endif
  	    char buf6[INET6_ADDRSTRLEN];
  	    inet_ntop (AF_INET6, &((struct sockaddr_in6 *)&dataAddr)->sin6_addr,
  		    buf6, INET6_ADDRSTRLEN);
diff -crN ./libxml2/python/Makefile.am /users3/olivap/sb/p64/src/./libxml2/python/Makefile.am
*** ./libxml2/python/Makefile.am	Sat Jan  1 17:49:02 2005
--- /users3/olivap/sb/p64/src/./libxml2/python/Makefile.am	Thu Apr  7 17:43:06 2005
***************
*** 36,42 ****
  python_LTLIBRARIES = libxml2mod.la
  
  libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
! libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@
  
  libxml2.py: $(srcdir)/libxml.py libxml2class.py
  	cat $(srcdir)/libxml.py libxml2class.py > libxml2.py
--- 36,43 ----
  python_LTLIBRARIES = libxml2mod.la
  
  libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
! libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ $(M_LIBS) \
! 			$(EXPAT_LIBS) -lpython${PYTHON_VERSION}
  
  libxml2.py: $(srcdir)/libxml.py libxml2class.py
  	cat $(srcdir)/libxml.py libxml2class.py > libxml2.py
diff -crN ./libxml2/trionan.c /users3/olivap/sb/p64/src/./libxml2/trionan.c
*** ./libxml2/trionan.c	Tue Jan  4 15:49:48 2005
--- /users3/olivap/sb/p64/src/./libxml2/trionan.c	Thu Apr 21 13:21:55 2005
***************
*** 1,6 ****
  /*************************************************************************
   *
!  * $Id: trionan.c,v 1.14 2003/10/15 08:17:58 veillard Exp $
   *
   * Copyright (C) 2001 Bjorn Reese <breese@users.sourceforge.net>
   *
--- 1,6 ----
  /*************************************************************************
   *
!  * $Id: trionan.c,v 1.1.4.5 2005/04/21 11:21:54 vivierl Exp $
   *
   * Copyright (C) 2001 Bjorn Reese <breese@users.sourceforge.net>
   *
***************
*** 112,118 ****
   * Constants
   */
  
! static TRIO_CONST char rcsid[] = "@(#)$Id: trionan.c,v 1.14 2003/10/15 08:17:58 veillard Exp $";
  
  #if defined(USE_IEEE_754)
  
--- 112,118 ----
   * Constants
   */
  
! static TRIO_CONST char rcsid[] = "@(#)$Id: trionan.c,v 1.1.4.5 2005/04/21 11:21:54 vivierl Exp $";
  
  #if defined(USE_IEEE_754)
  
***************
*** 324,330 ****
    if (result == 0.0) {
      
  #if defined(TRIO_COMPILER_SUPPORTS_C99)
!     result = nan("");
  
  #elif defined(NAN) && defined(__STDC_IEC_559__)
      result = (double)NAN;
--- 324,331 ----
    if (result == 0.0) {
      
  #if defined(TRIO_COMPILER_SUPPORTS_C99)
! /*    result = nan(""); */
!  result = strtod("NAN()", (char **) NULL);
  
  #elif defined(NAN) && defined(__STDC_IEC_559__)
      result = (double)NAN;