svn commit: r1534981 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h libsvn_subr/io.c

[br...@apache.org]

Author: brane
Date: Wed Oct 23 10:54:16 2013
New Revision: 1534981

URL: http://svn.apache.org/r1534981
Log:
APR keeps some symbols that we need hidden away in a private header.

* subversion/include/private/svn_dep_compat.h
  (APR_FREADONLY, APR_OPENINFO): Conditionally define constants.
* subversion/libsvn_subr/io.c: Include svn_dep_compat.h.
  (APR_FREADONLY): Remove this definition.

Modified:
    subversion/trunk/subversion/include/private/svn_dep_compat.h
    subversion/trunk/subversion/libsvn_subr/io.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=1534981&r1=1534980&r2=1534981&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/trunk/subversion/include/private/svn_dep_compat.h Wed Oct 23 10:54:16 2013
@@ -115,6 +115,19 @@ typedef apr_uint32_t apr_uintptr_t;
 #endif
 
 /**
+ * APR keeps a few interesting defines hidden away in its private
+ * headers apr_arch_file_io.h, so we redefined them here.
+ *
+ * @since New in 1.9
+ */
+#ifndef APR_FREADONLY
+#define APR_FREADONLY 0x10000000
+#endif
+#ifndef APR_OPENINFO
+#define APR_OPENINFO  0x00100000
+#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_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1534981&r1=1534980&r2=1534981&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Wed Oct 23 10:54:16 2013
@@ -38,14 +38,6 @@
 #endif
 #endif
 
-/* This symbol is defined in APR's private header apr_arch_file_io.h.
-   It should really be public, but ... there it is. */
-#if defined(WIN32) || defined(__OS2__) || !defined(APR_HAS_USER)
-#ifndef APR_FREADONLY
-#define APR_FREADONLY 0x10000000
-#endif
-#endif
-
 #include <apr_lib.h>
 #include <apr_pools.h>
 #include <apr_file_io.h>
@@ -75,6 +67,7 @@
 #include "private/svn_atomic.h"
 #include "private/svn_io_private.h"
 #include "private/svn_utf_private.h"
+#include "private/svn_dep_compat.h"
 
 #define SVN_SLEEP_ENV_VAR "SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_SLEEP_FOR_TIMESTAMPS"