diff options
| author | Ken Brown <kbrown@cornell.edu> | 2022-05-22 22:18:48 +0300 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2022-05-30 00:45:52 +0300 |
| commit | 2d9b48760c48f19b2941f05ee6720f510700823c (patch) | |
| tree | 693f2793b34d8aea8a57d8e0f6202d802eb91097 /winsup/cygwin/mmap.cc | |
| parent | 7c0de0af97d35c8fed5ffbf311e54af85d1c4af3 (diff) | |
Cygwin: simplify some function names
Remove "32" or "64" from each of the following names: acl32,
aclcheck32, aclfrommode32, aclfrompbits32, aclfromtext32, aclsort32,
acltomode32, acltopbits32, acltotext32, facl32, fchown32, fcntl64,
fstat64, _fstat64, _fstat64_r, ftruncate64, getgid32, getgrent32,
getgrgid32, getgrnam32, getgroups32, getpwuid32, getpwuid_r32,
getuid32, getuid32, initgroups32, lseek64, lstat64, mknod32, mmap64,
setegid32, seteuid32, setgid32, setgroups32, setregid32, setreuid32,
setuid32, stat64, _stat64_r, truncate64.
Remove prototypes and macro definitions of these names.
Remove "#ifndef __INSIDE_CYGWIN__" from some headers so that the new
names will be available when compiling Cygwin.
Remove aliases that are no longer needed.
Include <unistd.h> in fhandler_clipboard.cc for the declarations of
geteuid and getegid.
Diffstat (limited to 'winsup/cygwin/mmap.cc')
| -rw-r--r-- | winsup/cygwin/mmap.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc index d8f5cf046..5aa6d0c09 100644 --- a/winsup/cygwin/mmap.cc +++ b/winsup/cygwin/mmap.cc @@ -238,7 +238,7 @@ MapView (HANDLE h, void *addr, size_t len, DWORD openflags, If it failed, and addr was not NULL and flags is not MAP_FIXED, try again with NULL address. - Note: Retrying the mapping might be unnecessary, now that mmap64 checks + Note: Retrying the mapping might be unnecessary, now that mmap checks for a valid memory area first. */ SIZE_T commitsize = attached (prot) ? 0 : len; status = NtMapViewOfSection (h, NtCurrentProcess (), &base, 0, commitsize, @@ -832,7 +832,7 @@ mmap_worker (mmap_list *map_list, fhandler_base *fh, caddr_t base, size_t len, } extern "C" void * -mmap64 (void *addr, size_t len, int prot, int flags, int fd, off_t off) +mmap (void *addr, size_t len, int prot, int flags, int fd, off_t off) { syscall_printf ("addr %p, len %lu, prot %y, flags %y, fd %d, off %Y", addr, len, prot, flags, fd, off); @@ -1145,8 +1145,6 @@ out: return ret; } -EXPORT_ALIAS (mmap64, mmap) - /* munmap () removes all mmapped pages between addr and addr+len. */ extern "C" int @@ -1280,7 +1278,7 @@ mprotect (void *addr, size_t len, int prot) syscall_printf ("mprotect (addr: %p, len %lu, prot %y)", addr, len, prot); - /* See comment in mmap64 for a description. */ + /* See comment in mmap for a description. */ const size_t pagesize = wincap.allocation_granularity (); if ((uintptr_t) addr % pagesize) { |