diff options
Diffstat (limited to 'sal/rtl/source/alloc_arena.c')
| -rw-r--r-- | sal/rtl/source/alloc_arena.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c index 888166e06a0d..b06366427f33 100644 --- a/sal/rtl/source/alloc_arena.c +++ b/sal/rtl/source/alloc_arena.c @@ -37,13 +37,6 @@ #include <string.h> #include <stdio.h> -#ifdef OS2 -#undef OSL_TRACE -#define OSL_TRACE 1 ? ((void)0) : _OSL_GLOBAL osl_trace -#define INCL_DOS -#include <os2.h> -#endif - /* ================================================================= * * * arena internals. @@ -1162,7 +1155,7 @@ SAL_CALL rtl_arena_free ( #if defined(SAL_UNX) #include <sys/mman.h> -#elif defined(SAL_W32) || defined(SAL_OS2) +#elif defined(SAL_W32) #define MAP_FAILED 0 #endif /* SAL_UNX || SAL_W32 */ @@ -1198,18 +1191,7 @@ SAL_CALL rtl_machdep_alloc ( addr = mmap (NULL, (size_t)(size), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); #elif defined(SAL_W32) addr = VirtualAlloc (NULL, (SIZE_T)(size), MEM_COMMIT, PAGE_READWRITE); -#elif defined(SAL_OS2) - { - APIRET rc; - addr = 0; - // Use DosAlloc* to get a 4KB page aligned address. - rc = DosAllocMem( &addr, size, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY); - if (rc) { - fprintf( stderr, "sal3::DosAllocMem failed rc=%d\n", rc); - addr = 0; - } - } -#endif /* (SAL_UNX || SAL_W32 || SAL_OS2) */ +#endif /* (SAL_UNX || SAL_W32) */ if (addr != MAP_FAILED) { @@ -1242,8 +1224,6 @@ SAL_CALL rtl_machdep_free ( (void) munmap(pAddr, nSize); #elif defined(SAL_W32) (void) VirtualFree ((LPVOID)(pAddr), (SIZE_T)(0), MEM_RELEASE); -#elif defined(SAL_OS2) - (void) DosFreeMem( pAddr); #endif /* (SAL_UNX || SAL_W32) */ } @@ -1262,10 +1242,6 @@ rtl_machdep_pagesize (void) SYSTEM_INFO info; GetSystemInfo (&info); return ((sal_Size)(info.dwPageSize)); -#elif defined(SAL_OS2) - ULONG ulPageSize; - DosQuerySysInfo(QSV_PAGE_SIZE, QSV_PAGE_SIZE, &ulPageSize, sizeof(ULONG)); - return ((sal_Size)ulPageSize); #endif /* (SAL_UNX || SAL_W32) */ } |