From fe9a9b251c4801feebc09815acf87a154d9d0390 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michaelrsweet@users.noreply.github.com>
Date: Wed, 7 Dec 2005 15:01:08 +0000
Subject: [PATCH] Conditionally check for EINTR (STR #33)

---
 CHANGES           | 5 ++++-
 doc/relnotes.html | 4 ++++
 makesrcdist       | 2 +-
 mxml-file.c       | 4 ++++
 mxml.spec         | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 34cbcd7..894eacd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,13 @@
-CHANGES - 12/02/2005
+CHANGES - 12/07/2005
 --------------------
 
 CHANGES IN Mini-XML 2.3
 
 	- Added two exceptions to the LGPL to support static
 	  linking of applications against Mini-XML.
+	- Added conditional check for EINTR error code for
+	  certain Windows compilers that do not define it (STR
+	  #33)
 	- The mxmldoc program now generates correct HTML 4.0
 	  output (previously it generated invalid XHTML...)
 	- The mxmldoc program now supports "@deprecated@,
diff --git a/doc/relnotes.html b/doc/relnotes.html
index 4d258b0..2c6ed6b 100644
--- a/doc/relnotes.html
+++ b/doc/relnotes.html
@@ -10,6 +10,10 @@
 	<li>Added two exceptions to the LGPL to support static
 	linking of applications against Mini-XML.</li>
 
+	<li>Added conditional check for EINTR error code for
+	certain Windows compilers that do not define it (STR
+	#33)</li>
+
 	<li>The mxmldoc program now generates correct HTML 4.0
 	output (previously it generated invalid XHTML...)</li>
 
diff --git a/makesrcdist b/makesrcdist
index 2565671..3e64b8c 100755
--- a/makesrcdist
+++ b/makesrcdist
@@ -31,7 +31,7 @@ cd mxml-$version
 
 echo "Removing Subversion files and directories..."
 
-rm -f makesrcdist TODO
+rm -f makesrcdist TODO mvalidate.c
 rm -rf www
 
 cd ..
diff --git a/mxml-file.c b/mxml-file.c
index 96f87d4..b648929 100644
--- a/mxml-file.c
+++ b/mxml-file.c
@@ -930,7 +930,11 @@ mxml_fd_read(mxml_fdbuf_t *buf)		/* I - File descriptor buffer */
   */
 
   while ((bytes = read(buf->fd, buf->buffer, sizeof(buf->buffer))) < 0)
+#ifdef EINTR
     if (errno != EAGAIN && errno != EINTR)
+#else
+    if (errno != EAGAIN)
+#endif /* EINTR */
       return (-1);
 
   if (bytes == 0)
diff --git a/mxml.spec b/mxml.spec
index 406790d..37dab57 100644
--- a/mxml.spec
+++ b/mxml.spec
@@ -18,7 +18,7 @@
 
 Summary: Miniature XML development library
 Name: mxml
-Version: 2.2.3
+Version: 2.3
 Release: 1
 Copyright: GPL
 Group: Development/Libraries