diff options
Diffstat (limited to 'contrib/bmake/make.h')
| -rw-r--r-- | contrib/bmake/make.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/contrib/bmake/make.h b/contrib/bmake/make.h index 50e590eb4c93..dab619c95b80 100644 --- a/contrib/bmake/make.h +++ b/contrib/bmake/make.h @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.323 2023/06/20 09:25:33 rillig Exp $ */ +/* $NetBSD: make.h,v 1.325 2023/09/10 11:52:29 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -196,6 +196,13 @@ typedef unsigned char bool; #endif /* + * IRIX defines OP_NONE in sys/fcntl.h + */ +#if defined(OP_NONE) +# undef OP_NONE +#endif + +/* * The typical flow of states is: * * The direct successful path: @@ -1214,8 +1221,8 @@ pp_skip_hspace(char **pp) } #if defined(lint) -extern void do_not_define_rcsid(void); /* for lint */ -# define MAKE_RCSID(id) extern void do_not_define_rcsid(void) +void do_not_define_rcsid(void); /* for lint */ +# define MAKE_RCSID(id) void do_not_define_rcsid(void) #elif defined(MAKE_NATIVE) # include <sys/cdefs.h> # ifndef __IDSTRING @@ -1234,7 +1241,7 @@ extern void do_not_define_rcsid(void); /* for lint */ # define MAKE_RCSID(id) static volatile char \ MAKE_RCSID_CONCAT(rcsid_, __COUNTER__)[] = id #elif defined(MAKE_ALL_IN_ONE) -# define MAKE_RCSID(id) extern void do_not_define_rcsid(void) +# define MAKE_RCSID(id) void do_not_define_rcsid(void) #else # define MAKE_RCSID(id) static volatile char rcsid[] = id #endif |