ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make use of solaris_try_mmap() for NetBSD. Rename it to

Browse Source 
try_mmap_fixed() since it's no longer Solaris-specific.
This commit is contained in:
Bang Jun-Young 2001-12-14 22:47:45 +00:00 committed by Alexandre Julliard
parent eda758ebcd
commit d0b304b956
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/port.c
View File

@ -40,7 +40,9 @@
#ifdef HAVE_LIBUTIL_H #ifdef HAVE_LIBUTIL_H
# include <libutil.h> # include <libutil.h>
#endif #endif
#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
/*********************************************************************** /***********************************************************************
* usleep * usleep
@ -397,9 +399,9 @@ int getrlimit (int resource, struct rlimit *rlim)
#endif /* HAVE_GETRLIMIT */ #endif /* HAVE_GETRLIMIT */
#ifdef __svr4__ #if defined(__svr4__) || defined(__NetBSD__)
/*********************************************************************** /***********************************************************************
* solaris_try_mmap * try_mmap_fixed
* *
* The purpose of this routine is to emulate the behaviour of * The purpose of this routine is to emulate the behaviour of
* the Linux mmap() routine if a non-NULL address is passed, * the Linux mmap() routine if a non-NULL address is passed,
@ -415,7 +417,7 @@ int getrlimit (int resource, struct rlimit *rlim)
* address range is still available, and placing the mapping there * address range is still available, and placing the mapping there
* using MAP_FIXED if so. * using MAP_FIXED if so.
*/ */
static int solaris_try_mmap (void *addr, size_t len, int prot, int flags, static int try_mmap_fixed (void *addr, size_t len, int prot, int flags,
int fildes, off_t off) int fildes, off_t off)
{ {
char * volatile result = NULL; char * volatile result = NULL;
@ -442,7 +444,7 @@ static int solaris_try_mmap (void *addr, size_t len, int prot, int flags,
if ( (pid = vfork()) == -1 ) if ( (pid = vfork()) == -1 )
{ {
perror("solaris_try_mmap: vfork"); perror("try_mmap_fixed: vfork");
exit(1); exit(1);
} }
if ( pid == 0 ) if ( pid == 0 )
@ -508,8 +510,8 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags )
flags |= MAP_PRIVATE; flags |= MAP_PRIVATE;
#endif #endif
#ifdef __svr4__ #if defined(__svr4__) || defined(__NetBSD__)
if ( solaris_try_mmap( start, size, prot, flags, fdzero, 0 ) ) if ( try_mmap_fixed( start, size, prot, flags, fdzero, 0 ) )
return start; return start;
#endif #endif