Author: pgollucci
Date: Mon Sep 11 12:25:24 2006
New Revision: 442299
URL: http://svn.apache.org/viewvc?view=rev&rev=442299
Log:
Take2:
account for signed vs unsigned comparison error on SunOS.
also, bump the PATCH_LEVEL
Modified:
httpd/apreq/trunk/include/apreq_version.h
httpd/apreq/trunk/library/util.c
Modified: httpd/apreq/trunk/include/apreq_version.h
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/include/apreq_version.h?view=diff&rev=442299&r1=442298&r2=442299
==============================================================================
--- httpd/apreq/trunk/include/apreq_version.h (original)
+++ httpd/apreq/trunk/include/apreq_version.h Mon Sep 11 12:25:24 2006
@@ -61,7 +61,7 @@
#define APREQ_MINOR_VERSION 6
/** patch level */
-#define APREQ_PATCH_VERSION 0
+#define APREQ_PATCH_VERSION 1
/**
* This symbol is defined for internal, "development" copies of libapreq.
Modified: httpd/apreq/trunk/library/util.c
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/library/util.c?view=diff&rev=442299&r1=442298&r2=442299
==============================================================================
--- httpd/apreq/trunk/library/util.c (original)
+++ httpd/apreq/trunk/library/util.c Mon Sep 11 12:25:24 2006
@@ -718,7 +718,29 @@
/* see how far we've come */
n = 0;
+#ifdef SOLARIS2
+# ifdef __GNUC__
+ /*
+ * iovec.iov_len is a long here
+ * which causes a comparison between
+ * signed(long) and unsigned(apr_size_t)
+ *
+ */
+ while (n < *nelts && len >= (apr_size_t)v[n].iov_len)
+# else
+ /*
+ * Sun C however defines this as size_t which is unsigned
+ *
+ */
while (n < *nelts && len >= v[n].iov_len)
+# endif /* !__GNUC__ */
+#else
+ /*
+ * Hopefully everything else does this
+ * (this was the default for years)
+ */
+ while (n < *nelts && len >= v[n].iov_len)
+#endif
len -= v[n++].iov_len;
if (n == *nelts) {
