svn commit: r934969 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h libsvn_client/patch.c

[hw...@apache.org]

Author: hwright
Date: Fri Apr 16 15:48:48 2010
New Revision: 934969

URL: http://svn.apache.org/viewvc?rev=934969&view=rev
Log:
If we don't have a recent enough APR, create a surrogate apr_array_clear().

* subversion/include/private/svn_dep_compat.h
  (apr_array_clear): New.

* subversion/libsvn_client/patch.c:
  Include the backward compat define.

Modified:
    subversion/trunk/subversion/include/private/svn_dep_compat.h
    subversion/trunk/subversion/libsvn_client/patch.c

Modified: subversion/trunk/subversion/include/private/svn_dep_compat.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_dep_compat.h?rev=934969&r1=934968&r2=934969&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/trunk/subversion/include/private/svn_dep_compat.h Fri Apr 16 15:48:48 2010
@@ -55,6 +55,14 @@ extern "C" {
 #endif /* APR_VERSION_AT_LEAST */
 
 /**
+ * If we don't have a recent enough APR, emulate the behavior of the
+ * apr_array_clear() API.
+ */
+#if !APR_VERSION_AT_LEAST(1,3,0)
+#define apr_array_clear(arr)         (arr)->nelts = 0
+#endif
+
+/**
  * Check at compile time if the Serf version is at least a certain
  * level.
  * @param major The major version component of the version checked

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=934969&r1=934968&r2=934969&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Fri Apr 16 15:48:48 2010
@@ -44,6 +44,7 @@
 #include "svn_private_config.h"
 #include "private/svn_eol_private.h"
 #include "private/svn_wc_private.h"
+#include "private/svn_dep_compat.h"
 
 typedef struct {
   /* The hunk. */