Last for today (compiles clean on Win32, hope the same for the rest of

  our builds.)  Clean up inherit_[un]set and simplify win32 discrepancy
  with inherit.h


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63481 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 9 insertions, 12 deletions

diff --git a/file_io/os2/open.c b/file_io/os2/open.c
index cef62e53b..05301d815 100644
--- a/file_io/os2/open.c
+++ b/file_io/os2/open.c
@@ -267,7 +267,7 @@ APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *
 
 APR_POOL_IMPLEMENT_ACCESSOR(file);
 
-APR_IMPLEMENT_SET_INHERIT(file, flags, pool, apr_file_cleanup)
+APR_IMPLEMENT_INHERIT_SET(file, flags, pool, apr_file_cleanup)
 
-APR_IMPLEMENT_UNSET_INHERIT(file, flags, pool, apr_file_cleanup)
+APR_IMPLEMENT_INHERIT_UNSET(file, flags, pool, apr_file_cleanup)
 
diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c
index 8c43de810..67b5e4974 100644
--- a/file_io/unix/filedup.c
+++ b/file_io/unix/filedup.c
@@ -113,7 +113,7 @@ static apr_status_t _file_dup(apr_file_t **new_file,
     (*new_file)->ungetchar = old_file->ungetchar;
 
     /* apr_file_dup() clears the inherit attribute, user must call 
-     * apr_file_set_inherit() again on the dupped handle, as necessary.
+     * apr_file_inherit_set() again on the dupped handle, as necessary.
      */
     (*new_file)->flags = old_file->flags & ~APR_INHERIT;
 
diff --git a/file_io/unix/open.c b/file_io/unix/open.c
index f887c9a47..46882a163 100644
--- a/file_io/unix/open.c
+++ b/file_io/unix/open.c
@@ -272,8 +272,8 @@ APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile,
     return apr_os_file_put(thefile, &fd, 0, pool);
 }
 
-APR_IMPLEMENT_SET_INHERIT(file, flags, pool, apr_unix_file_cleanup)
+APR_IMPLEMENT_INHERIT_SET(file, flags, pool, apr_unix_file_cleanup)
 
-APR_IMPLEMENT_UNSET_INHERIT(file, flags, pool, apr_unix_file_cleanup)
+APR_IMPLEMENT_INHERIT_UNSET(file, flags, pool, apr_unix_file_cleanup)
 
 APR_POOL_IMPLEMENT_ACCESSOR(file)
diff --git a/file_io/win32/open.c b/file_io/win32/open.c
index df7a959cf..796d0e45b 100644
--- a/file_io/win32/open.c
+++ b/file_io/win32/open.c
@@ -68,6 +68,7 @@
 #include <sys/stat.h>
 #endif
 #include "misc.h"
+#include "inherit.h"
 
 #if APR_HAS_UNICODE_FS
 apr_status_t utf8_to_unicode_path(apr_wchar_t* retstr, apr_size_t retlen, 
@@ -605,10 +606,6 @@ APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *
 
 APR_POOL_IMPLEMENT_ACCESSOR(file);
 
-APR_DECLARE_SET_INHERIT(file) {
-    return;
-}
-
-APR_DECLARE_UNSET_INHERIT(file) {
-    return;
-}
+APR_IMPLEMENT_INHERIT_SET(file, flags, pool, file_cleanup)
+ 
+APR_IMPLEMENT_INHERIT_UNSET(file, flags, pool, file_cleanup)