Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
Revert "update deprecation of MAP_ANON from core.sys.posix.sys.mman"
Browse files Browse the repository at this point in the history
This reverts commit 7696218.
  • Loading branch information
MartinNowak committed Oct 4, 2014
1 parent 7696218 commit 244b907
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 303 deletions.
7 changes: 0 additions & 7 deletions mak/COPY
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,12 @@ COPY=\
\
$(IMPDIR)\core\sys\freebsd\dlfcn.d \
$(IMPDIR)\core\sys\freebsd\execinfo.d \
\
$(IMPDIR)\core\sys\freebsd\sys\cdefs.d \
$(IMPDIR)\core\sys\freebsd\sys\elf.d \
$(IMPDIR)\core\sys\freebsd\sys\elf_common.d \
$(IMPDIR)\core\sys\freebsd\sys\elf32.d \
$(IMPDIR)\core\sys\freebsd\sys\elf64.d \
$(IMPDIR)\core\sys\freebsd\sys\event.d \
$(IMPDIR)\core\sys\freebsd\sys\link_elf.d \
$(IMPDIR)\core\sys\freebsd\sys\mman.d \
\
$(IMPDIR)\core\sys\linux\config.d \
$(IMPDIR)\core\sys\linux\dlfcn.d \
Expand All @@ -68,7 +65,6 @@ COPY=\
\
$(IMPDIR)\core\sys\osx\execinfo.d \
$(IMPDIR)\core\sys\osx\pthread.d \
\
$(IMPDIR)\core\sys\osx\mach\dyld.d \
$(IMPDIR)\core\sys\osx\mach\getsect.d \
$(IMPDIR)\core\sys\osx\mach\kern_return.d \
Expand All @@ -77,9 +73,6 @@ COPY=\
$(IMPDIR)\core\sys\osx\mach\semaphore.d \
$(IMPDIR)\core\sys\osx\mach\thread_act.d \
\
$(IMPDIR)\core\sys\osx\sys\cdefs.d \
$(IMPDIR)\core\sys\osx\sys\mman.d \
\
$(IMPDIR)\core\sys\posix\arpa\inet.d \
$(IMPDIR)\core\sys\posix\config.d \
$(IMPDIR)\core\sys\posix\dirent.d \
Expand Down
5 changes: 0 additions & 5 deletions mak/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,12 @@ MANIFEST=\
src\core\sys\freebsd\dlfcn.d \
src\core\sys\freebsd\execinfo.d \
\
src\core\sys\freebsd\sys\cdefs.d \
src\core\sys\freebsd\sys\elf.d \
src\core\sys\freebsd\sys\elf_common.d \
src\core\sys\freebsd\sys\elf32.d \
src\core\sys\freebsd\sys\elf64.d \
src\core\sys\freebsd\sys\event.d \
src\core\sys\freebsd\sys\link_elf.d \
src\core\sys\freebsd\sys\mman.d \
\
src\core\sys\linux\config.d \
src\core\sys\linux\dlfcn.d \
Expand All @@ -105,9 +103,6 @@ MANIFEST=\
src\core\sys\osx\mach\semaphore.d \
src\core\sys\osx\mach\thread_act.d \
\
src\core\sys\osx\sys\cdefs.d \
src\core\sys\osx\sys\mman.d \
\
src\core\sys\posix\config.d \
src\core\sys\posix\dirent.d \
src\core\sys\posix\dlfcn.d \
Expand Down
1 change: 0 additions & 1 deletion mak/SRCS
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ SRCS=\
\
src\core\sys\freebsd\execinfo.d \
src\core\sys\freebsd\sys\event.d \
src\core\sys\freebsd\sys\mman.d \
\
src\core\sys\posix\signal.d \
src\core\sys\posix\dirent.d \
Expand Down
16 changes: 0 additions & 16 deletions src/core/sys/freebsd/sys/cdefs.d

This file was deleted.

145 changes: 0 additions & 145 deletions src/core/sys/freebsd/sys/mman.d

This file was deleted.

14 changes: 12 additions & 2 deletions src/core/sys/linux/sys/mman.d
Original file line number Diff line number Diff line change
Expand Up @@ -649,12 +649,22 @@ else
static if (__USE_MISC) enum
{
MAP_FILE = 0,
MAP_ANONYMOUS = __MAP_ANONYMOUS,
MAP_ANON = MAP_ANONYMOUS,
//MAP_ANONYMOUS = __MAP_ANONYMOUS,
//MAP_ANON = MAP_ANONYMOUS,
MAP_HUGE_SHIFT = 26,
MAP_HUGE_MASK = 0x3f,
}

/* This should be behind the static if (__USE_MISC), but it runs into
* trouble with the alias declaration for MAP_ANON in core.sys.posix.sys.mman
* due to forward reference problems. See Bugzilla 11301 for a fuller explanation.
*/
enum
{
MAP_ANONYMOUS = __MAP_ANONYMOUS,
MAP_ANON = MAP_ANONYMOUS,
}

// in core.sys.posix.sys.mman
// enum
// {
Expand Down
16 changes: 0 additions & 16 deletions src/core/sys/osx/sys/cdefs.d

This file was deleted.

105 changes: 0 additions & 105 deletions src/core/sys/osx/sys/mman.d

This file was deleted.

Loading

1 comment on commit 244b907

@MartinNowak
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Today is the day of accidentally pushing to upstream/master :).

Please sign in to comment.