apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1086125 - in /apr/apr: branches/1.3.x/include/apr_want.h branches/1.4.x/include/apr_want.h branches/1.5.x/include/apr_want.h trunk/include/apr_want.h
Date Mon, 28 Mar 2011 05:32:20 GMT
Author: fuankg
Date: Mon Mar 28 05:32:20 2011
New Revision: 1086125

URL: http://svn.apache.org/viewvc?rev=1086125&view=rev
Log:
Fixed protection of our own struct iovec define.

Modified:
    apr/apr/branches/1.3.x/include/apr_want.h
    apr/apr/branches/1.4.x/include/apr_want.h
    apr/apr/branches/1.5.x/include/apr_want.h
    apr/apr/trunk/include/apr_want.h

Modified: apr/apr/branches/1.3.x/include/apr_want.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr_want.h?rev=1086125&r1=1086124&r2=1086125&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr_want.h (original)
+++ apr/apr/branches/1.3.x/include/apr_want.h Mon Mar 28 05:32:20 2011
@@ -89,19 +89,16 @@
 
 #else
 
+#ifndef APR_IOVEC_DEFINED
+#define APR_IOVEC_DEFINED
 struct iovec
 {
     char *iov_base;
     size_t iov_len;
 };
+#endif /* !APR_IOVEC_DEFINED */
 
-#endif
-
-/* apr_want is included at several layers; redefining APR_HAVE_IOVEC
- * now to ensure that our struct is not introduced several times.
- */
-#undef APR_HAVE_IOVEC
-#define APR_HAVE_IOVEC 1
+#endif /* APR_HAVE_IOVEC */
 
 #undef APR_WANT_IOVEC
 #endif

Modified: apr/apr/branches/1.4.x/include/apr_want.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_want.h?rev=1086125&r1=1086124&r2=1086125&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_want.h (original)
+++ apr/apr/branches/1.4.x/include/apr_want.h Mon Mar 28 05:32:20 2011
@@ -89,19 +89,16 @@
 
 #else
 
+#ifndef APR_IOVEC_DEFINED
+#define APR_IOVEC_DEFINED
 struct iovec
 {
     void *iov_base;
     size_t iov_len;
 };
+#endif /* !APR_IOVEC_DEFINED */
 
-#endif
-
-/* apr_want is included at several layers; redefining APR_HAVE_IOVEC
- * now to ensure that our struct is not introduced several times.
- */
-#undef APR_HAVE_IOVEC
-#define APR_HAVE_IOVEC 1
+#endif /* APR_HAVE_IOVEC */
 
 #undef APR_WANT_IOVEC
 #endif

Modified: apr/apr/branches/1.5.x/include/apr_want.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_want.h?rev=1086125&r1=1086124&r2=1086125&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_want.h (original)
+++ apr/apr/branches/1.5.x/include/apr_want.h Mon Mar 28 05:32:20 2011
@@ -89,19 +89,16 @@
 
 #else
 
+#ifndef APR_IOVEC_DEFINED
+#define APR_IOVEC_DEFINED
 struct iovec
 {
     void *iov_base;
     size_t iov_len;
 };
+#endif /* !APR_IOVEC_DEFINED */
 
-#endif
-
-/* apr_want is included at several layers; redefining APR_HAVE_IOVEC
- * now to ensure that our struct is not introduced several times.
- */
-#undef APR_HAVE_IOVEC
-#define APR_HAVE_IOVEC 1
+#endif /* APR_HAVE_IOVEC */
 
 #undef APR_WANT_IOVEC
 #endif

Modified: apr/apr/trunk/include/apr_want.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_want.h?rev=1086125&r1=1086124&r2=1086125&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_want.h (original)
+++ apr/apr/trunk/include/apr_want.h Mon Mar 28 05:32:20 2011
@@ -89,19 +89,16 @@
 
 #else
 
+#ifndef APR_IOVEC_DEFINED
+#define APR_IOVEC_DEFINED
 struct iovec
 {
     void *iov_base;
     size_t iov_len;
 };
+#endif /* !APR_IOVEC_DEFINED */
 
-#endif
-
-/* apr_want is included at several layers; redefining APR_HAVE_IOVEC
- * now to ensure that our struct is not introduced several times.
- */
-#undef APR_HAVE_IOVEC
-#define APR_HAVE_IOVEC 1
+#endif /* APR_HAVE_IOVEC */
 
 #undef APR_WANT_IOVEC
 #endif



Mime
View raw message