Skip to content

Commit 68b39b6

Browse files
committed
Avoid c++ operator new keyword in header files
1 parent e73bdb9 commit 68b39b6

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

include/mint/mintbind.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -464,10 +464,10 @@ __extension__ \
464464
trap_1_wl(0x12b, (long)(handle))
465465
#define Fxattr(flag, name, buf) \
466466
trap_1_wwll(0x12c, (short)(flag), (long)(name), (long)(buf))
467-
#define Flink(old, new) \
468-
trap_1_wll(0x12d, (long)(old), (long)(new))
469-
#define Fsymlink(old, new) \
470-
trap_1_wll(0x12e, (long)(old), (long)(new))
467+
#define Flink(old, _new) \
468+
trap_1_wll(0x12d, (long)(old), (long)(_new))
469+
#define Fsymlink(old, _new) \
470+
trap_1_wll(0x12e, (long)(old), (long)(_new))
471471
#define Freadlink(siz, buf, linknm) \
472472
trap_1_wwll(0x12f, (short)(siz), (long)(buf), (long)(linknm))
473473
#define Dcntl(cmd, name, arg) \
@@ -568,8 +568,8 @@ __extension__ \
568568
trap_1_wwll(0x15c,(short)(fh),(long)(iovp),(long)(iovcnt))
569569
#define Ffstat64(fh, stat) \
570570
trap_1_wwl(0x15d,(short)(fh),(long)(stat))
571-
#define Psysctl(name, namelen, old, oldlenp, new, newlen) \
572-
trap_1_wllllll(0x15e,(long)(name),(long)(namelen),(long)(old),(long)(oldlenp),(long)(new),(long)(newlen))
571+
#define Psysctl(name, namelen, old, oldlenp, _new, newlen) \
572+
trap_1_wllllll(0x15e,(long)(name),(long)(namelen),(long)(old),(long)(oldlenp),(long)(_new),(long)(newlen))
573573
#define Pemulation(which, op, a1, a2, a3, a4, a5, a6, a7) \
574574
trap_1_wwwlllllll(0x15f,(short)(which),(short)(op),(long)(a1),(long)(a2),(long)(a3),(long)(a4),(long)(a5),(long)(a6),(long)(a7))
575575
#define Fsocket(domain, type, protocol) \

include/mint/net.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ struct dom_ops
102102
short addrlen, short flags);
103103

104104
long (*socketpair) (struct socket *s1, struct socket *s2);
105-
long (*accept) (struct socket *s, struct socket *new,
105+
long (*accept) (struct socket *s, struct socket *_new,
106106
short flags);
107107

108108
long (*getname) (struct socket *s, struct sockaddr *addr,

include/mint/osbind.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,9 +1104,9 @@ __extension__ \
11041104
(long)trap_1_wlw((short)(0x4E),(long)(filespec),(short)(attr))
11051105
#define Fsnext() \
11061106
(long)trap_1_w((short)(0x4F))
1107-
#define Frename(zero,old,new) \
1107+
#define Frename(zero,old,_new) \
11081108
(short)trap_1_wwll((short)(0x56),(short)(zero), \
1109-
(long)(old),(long)(new))
1109+
(long)(old),(long)(_new))
11101110
#define Fdatime(timeptr,handle,rwflag) \
11111111
(long)trap_1_wlww((short)(0x57),(long)(timeptr), \
11121112
(short)(handle),(short)(rwflag))

include/mint/sysctl.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/*
2-
* $Id$
3-
*
42
* This file belongs to FreeMiNT. It's not in the original MiNT 1.12
53
* distribution. See the file CHANGES for a detailed log of changes.
64
*
@@ -181,9 +179,9 @@ struct ctlname
181179
# ifndef __KERNEL__
182180

183181
int __sysctl (int *name, unsigned long namelen, void *old, unsigned long *oldlenp,
184-
const void *new, unsigned long newlen);
182+
const void *_new, unsigned long newlen);
185183
int sysctl (int *name, unsigned long namelen, void *old, unsigned long *oldlenp,
186-
const void *new, unsigned long newlen);
184+
const void *_new, unsigned long newlen);
187185

188186
# endif
189187

0 commit comments

Comments
 (0)