1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
Description: fix conflict with sys/mman.h
due to "new-style" prototypes (with void*)
are exposed by default instead of caddr_t
Index: b/usr/src/lib/libc/port/gen/madvise.c
===================================================================
--- a/usr/src/lib/libc/port/gen/madvise.c
+++ b/usr/src/lib/libc/port/gen/madvise.c
@@ -24,9 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-#include "lint.h"
#include <sys/types.h>
#include <sys/mman.h>
@@ -35,7 +32,7 @@
* management of the memory resources of a particular application.
*/
int
-madvise(caddr_t addr, size_t len, int advice)
+madvise(void * addr, size_t len, int advice)
{
return (memcntl(addr, len, MC_ADVISE, (caddr_t)(intptr_t)advice, 0, 0));
}
Index: b/usr/src/lib/libc/port/gen/mlock.c
===================================================================
--- a/usr/src/lib/libc/port/gen/mlock.c
+++ b/usr/src/lib/libc/port/gen/mlock.c
@@ -27,11 +27,9 @@
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
-#pragma ident "%Z%%M% %I% %E% SMI"
#pragma weak _mlock = mlock
-#include "lint.h"
#include <sys/types.h>
#include <sys/mman.h>
@@ -39,7 +37,7 @@
* Function to lock address range in memory.
*/
int
-mlock(caddr_t addr, size_t len)
+mlock(const void *addr, size_t len)
{
- return (memcntl(addr, len, MC_LOCK, 0, 0, 0));
+ return (memcntl((void *)addr, len, MC_LOCK, 0, 0, 0));
}
Index: b/usr/src/lib/libc/port/gen/munlock.c
===================================================================
--- a/usr/src/lib/libc/port/gen/munlock.c
+++ b/usr/src/lib/libc/port/gen/munlock.c
@@ -27,11 +27,8 @@
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#pragma weak _munlock = munlock
-#include "lint.h"
#include <sys/types.h>
#include <sys/mman.h>
@@ -40,7 +37,7 @@
*/
int
-munlock(caddr_t addr, size_t len)
+munlock(const void *addr, size_t len)
{
- return (memcntl(addr, len, MC_UNLOCK, 0, 0, 0));
+ return (memcntl((void *)addr, len, MC_UNLOCK, 0, 0, 0));
}
Index: b/usr/src/lib/libc/port/threads/scalls.c
===================================================================
--- a/usr/src/lib/libc/port/threads/scalls.c
+++ b/usr/src/lib/libc/port/threads/scalls.c
@@ -29,7 +29,6 @@
#define __USE_LEGACY_SIGWAIT
-#include "lint.h"
#include "thr_uberdata.h"
#include <stdarg.h>
#include <poll.h>
@@ -812,9 +811,9 @@ msgsnd(int msqid, const void *msgp, size
}
int
-msync(caddr_t addr, size_t len, int flags)
+msync(void *addr, size_t len, int flags)
{
- extern int __msync(caddr_t, size_t, int);
+ extern int __msync(void *, size_t, int);
int rv;
PERFORM(__msync(addr, len, flags))
|
