diff options
| author | Mladen Turk <mturk@apache.org> | 2021-12-02 22:03:51 +0000 |
|---|---|---|
| committer | Mladen Turk <mturk@apache.org> | 2021-12-02 22:03:51 +0000 |
| commit | 62285e4db364a86e99699b0a1d13a2f2f3bae49f (patch) | |
| tree | 01385a10f35737e7cba3aa46bbf1f47b7227ae9b /shmem | |
| parent | 3579ad96307fc536b7e53d8dc81a819655446c71 (diff) | |
| download | apr-62285e4db364a86e99699b0a1d13a2f2f3bae49f.tar.gz | |
Stage 2 in cleaning win95 code ... cleanup filesys
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895510 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
| -rw-r--r-- | shmem/win32/shm.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/shmem/win32/shm.c b/shmem/win32/shm.c index 48b33b8b8..b873942ce 100644 --- a/shmem/win32/shm.c +++ b/shmem/win32/shm.c @@ -189,20 +189,8 @@ APR_DECLARE(apr_status_t) apr_shm_create_ex(apr_shm_t **m, mapkey = res_name_from_filename(file, global, pool); } -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - hMap = CreateFileMappingW(hFile, NULL, PAGE_READWRITE, - sizehi, sizelo, mapkey); - } -#endif -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - hMap = CreateFileMappingA(hFile, NULL, PAGE_READWRITE, - sizehi, sizelo, mapkey); - } -#endif + hMap = CreateFileMappingW(hFile, NULL, PAGE_READWRITE, + sizehi, sizelo, mapkey); err = apr_get_os_error(); if (file) { @@ -288,19 +276,7 @@ static apr_status_t shm_attach_internal(apr_shm_t **m, */ mapkey = res_name_from_filename(file, global, pool); -#if APR_HAS_UNICODE_FS - IF_WIN_OS_IS_UNICODE - { - hMap = OpenFileMappingW(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey); - } -#endif -#if APR_HAS_ANSI_FS - ELSE_WIN_OS_IS_ANSI - { - hMap = OpenFileMappingA(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey); - } -#endif - + hMap = OpenFileMappingW(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey); if (!hMap) { return apr_get_os_error(); } |