Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
53496f83
Commit
53496f83
authored
Jan 23, 2006
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a couple of warnings on MacOS.
parent
9daaab54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
mmap.c
libs/wine/mmap.c
+10
-7
timer.c
server/timer.c
+2
-2
No files found.
libs/wine/mmap.c
View file @
53496f83
...
...
@@ -140,6 +140,9 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags,
#elif defined(__APPLE__)
#include <mach/mach_init.h>
#include <mach/vm_map.h>
/*
* On Darwin, we can use the Mach call vm_allocate to allocate
* anonymous memory at the specified address, and then use mmap with
...
...
@@ -148,15 +151,15 @@ static int try_mmap_fixed (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
)
{
void
*
result
;
result
=
addr
;
if
(
vm_allocate
(
mach_task_self
(),
&
result
,
len
,
0
))
return
0
;
else
vm_address_t
result
=
(
vm_address_t
)
addr
;
if
(
!
vm_allocate
(
mach_task_self
(),
&
result
,
len
,
0
))
{
result
=
mmap
(
addr
,
len
,
prot
,
flags
|
MAP_FIXED
,
fildes
,
off
);
return
result
==
addr
;
if
(
mmap
(
(
void
*
)
result
,
len
,
prot
,
flags
|
MAP_FIXED
,
fildes
,
off
)
!=
MAP_FAILED
)
return
1
;
vm_deallocate
(
mach_task_self
(),
result
,
len
);
}
return
0
;
}
#endif
/* (__svr4__ || __NetBSD__) && !MAP_TRYFIXED */
...
...
server/timer.c
View file @
53496f83
...
...
@@ -176,8 +176,8 @@ static void timer_dump( struct object *obj, int verbose )
{
struct
timer
*
timer
=
(
struct
timer
*
)
obj
;
assert
(
obj
->
ops
==
&
timer_ops
);
fprintf
(
stderr
,
"Timer manual=%d when=%ld.%06
ld
period=%d "
,
timer
->
manual
,
timer
->
when
.
tv_sec
,
timer
->
when
.
tv_usec
,
timer
->
period
);
fprintf
(
stderr
,
"Timer manual=%d when=%ld.%06
u
period=%d "
,
timer
->
manual
,
timer
->
when
.
tv_sec
,
(
unsigned
int
)
timer
->
when
.
tv_usec
,
timer
->
period
);
dump_object_name
(
&
timer
->
obj
);
fputc
(
'\n'
,
stderr
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment