aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam M. Brack <wbrack@src.gnome.org>2007-03-14 12:40:21 +0000
committerWilliam M. Brack <wbrack@src.gnome.org>2007-03-14 12:40:21 +0000
commit0c1e301175fb1e37436c9c352059bac80aed7dda (patch)
treec30267492ef216b640f6e33b36485c17b0dc8709
parent06559b3add28c31d15ab6f91f524324df6f909aa (diff)
downloadandroid_external_libxml2-0c1e301175fb1e37436c9c352059bac80aed7dda.tar.gz
android_external_libxml2-0c1e301175fb1e37436c9c352059bac80aed7dda.tar.bz2
android_external_libxml2-0c1e301175fb1e37436c9c352059bac80aed7dda.zip
corrected small error in last commit corrected small typo in last commit
* configure.in: corrected small error in last commit * xmlreader.c: corrected small typo in last commit svn path=/trunk/; revision=3591
-rw-r--r--ChangeLog5
-rw-r--r--configure.in9
-rw-r--r--xmlreader.c2
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 87b68fb5..e46af1df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 14 20:30:38 HKT 2007 William Brack <wbrack@mmm.com.hk>
+
+ * configure.in: corrected small error in last commit
+ * xmlreader.c: corrected small typo in last commit
+
Wed Mar 14 19:35:28 HKT 2007 William Brack <wbrack@mmm.com.hk>
* xmlschemas.c: fixed problem with referenced attribute groups
diff --git a/configure.in b/configure.in
index 60754685..5e7ca7ba 100644
--- a/configure.in
+++ b/configure.in
@@ -506,8 +506,9 @@ fi
if test $enable_ipv6 = yes; then
have_ipv6=no
AC_TRY_COMPILE([
- #include <sys/types.h>], [
+ #include <sys/types.h>
#include <sys/socket.h>
+ ], [
struct sockaddr_storage ss;
socket(AF_INET6, SOCK_STREAM, 0)
],
@@ -529,8 +530,9 @@ if test $enable_ipv6 = yes; then
dnl ********************************************************************
AC_MSG_CHECKING([struct sockaddr::ss_family])
AC_TRY_COMPILE([
- #include <sys/types.h>], [
+ #include <sys/types.h>
#include <sys/socket.h>
+ ], [
struct sockaddr_storage ss ;
ss.ss_family = 0 ;
],
@@ -541,8 +543,9 @@ if test $enable_ipv6 = yes; then
if test x$have_ss_family = xno ; then
AC_MSG_CHECKING([broken struct sockaddr::ss_family])
AC_TRY_COMPILE([
- #include <sys/types.h>], [
+ #include <sys/types.h>
#include <sys/socket.h>
+ ], [
struct sockaddr_storage ss ;
ss.__ss_family = 0 ;
],
diff --git a/xmlreader.c b/xmlreader.c
index ce66b826..d7bddec9 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1170,7 +1170,7 @@ xmlTextReaderDoExpand(xmlTextReaderPtr reader) {
return(1);
val = xmlTextReaderPushData(reader);
if (val < 0){
- reader->mode == XML_TEXTREADER_MODE_ERROR;
+ reader->mode = XML_TEXTREADER_MODE_ERROR;
return(-1);
}
} while(reader->mode != XML_TEXTREADER_MODE_EOF);