diff options
| author | Ivan Zhakov <ivan@apache.org> | 2019-06-07 15:59:55 +0000 |
|---|---|---|
| committer | Ivan Zhakov <ivan@apache.org> | 2019-06-07 15:59:55 +0000 |
| commit | 54e6f2f0968e89e2e6033fea51d86b2c8c63c3f5 (patch) | |
| tree | beccd806c65e6ba744cac83cc18a8c6e9fec4679 /include/arch | |
| parent | a980f528819f2dbe45f896b310e479be7fbc685c (diff) | |
| download | apr-54e6f2f0968e89e2e6033fea51d86b2c8c63c3f5.tar.gz | |
Remove legacy and dead code from include/arch/win32/apr_arch_inherit.h.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1860777 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/arch')
| -rw-r--r-- | include/arch/win32/apr_arch_inherit.h | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/include/arch/win32/apr_arch_inherit.h b/include/arch/win32/apr_arch_inherit.h index 8969af664..9ed151400 100644 --- a/include/arch/win32/apr_arch_inherit.h +++ b/include/arch/win32/apr_arch_inherit.h @@ -21,84 +21,6 @@ #define APR_INHERIT (1 << 24) /* Must not conflict with other bits */ -#if APR_HAS_UNICODE_FS && APR_HAS_ANSI_FS -/* !defined(_WIN32_WCE) is implicit here */ - -#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup) \ -APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \ -{ \ - IF_WIN_OS_IS_UNICODE \ - { \ -/* if (!SetHandleInformation(the##name->filehand, \ - * HANDLE_FLAG_INHERIT, \ - * HANDLE_FLAG_INHERIT)) \ - * return apr_get_os_error(); \ - */ } \ - ELSE_WIN_OS_IS_ANSI \ - { \ - HANDLE temp, hproc = GetCurrentProcess(); \ - if (!DuplicateHandle(hproc, the##name->filehand, \ - hproc, &temp, 0, TRUE, \ - DUPLICATE_SAME_ACCESS)) \ - return apr_get_os_error(); \ - CloseHandle(the##name->filehand); \ - the##name->filehand = temp; \ - } \ - return APR_SUCCESS; \ -} - -#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup) \ -APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\ -{ \ - IF_WIN_OS_IS_UNICODE \ - { \ -/* if (!SetHandleInformation(the##name->filehand, \ - * HANDLE_FLAG_INHERIT, 0)) \ - * return apr_get_os_error(); \ - */ } \ - ELSE_WIN_OS_IS_ANSI \ - { \ - HANDLE temp, hproc = GetCurrentProcess(); \ - if (!DuplicateHandle(hproc, the##name->filehand, \ - hproc, &temp, 0, FALSE, \ - DUPLICATE_SAME_ACCESS)) \ - return apr_get_os_error(); \ - CloseHandle(the##name->filehand); \ - the##name->filehand = temp; \ - } \ - return APR_SUCCESS; \ -} - -#elif APR_HAS_ANSI_FS || defined(_WIN32_WCE) - -#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup) \ -APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \ -{ \ - HANDLE temp, hproc = GetCurrentProcess(); \ - if (!DuplicateHandle(hproc, the##name->filehand, \ - hproc, &temp, 0, TRUE, \ - DUPLICATE_SAME_ACCESS)) \ - return apr_get_os_error(); \ - CloseHandle(the##name->filehand); \ - the##name->filehand = temp; \ - return APR_SUCCESS; \ -} - -#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup) \ -APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\ -{ \ - HANDLE temp, hproc = GetCurrentProcess(); \ - if (!DuplicateHandle(hproc, the##name->filehand, \ - hproc, &temp, 0, FALSE, \ - DUPLICATE_SAME_ACCESS)) \ - return apr_get_os_error(); \ - CloseHandle(the##name->filehand); \ - the##name->filehand = temp; \ - return APR_SUCCESS; \ -} - -#else /* APR_HAS_UNICODE_FS && !APR_HAS_ANSI_FS && !defined(_WIN32_WCE) */ - #define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup) \ APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \ { \ @@ -118,6 +40,5 @@ APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\ */ return APR_SUCCESS; \ } -#endif /* defined(APR_HAS_UNICODE_FS) */ #endif /* ! INHERIT_H */ |