apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1860777 - /apr/apr/trunk/include/arch/win32/apr_arch_inherit.h
Date Fri, 07 Jun 2019 15:59:56 GMT
Author: ivan
Date: Fri Jun  7 15:59:55 2019
New Revision: 1860777

URL: http://svn.apache.org/viewvc?rev=1860777&view=rev
Log:
Remove legacy and dead code from include/arch/win32/apr_arch_inherit.h.

Modified:
    apr/apr/trunk/include/arch/win32/apr_arch_inherit.h

Modified: apr/apr/trunk/include/arch/win32/apr_arch_inherit.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_inherit.h?rev=1860777&r1=1860776&r2=1860777&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_inherit.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_inherit.h Fri Jun  7 15:59:55 2019
@@ -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##_i
  */ return APR_SUCCESS;                                             \
 }
 
-#endif /* defined(APR_HAS_UNICODE_FS) */
 
 #endif	/* ! INHERIT_H */



Mime
View raw message