Module Name: src
Committed By: rillig
Date: Sat Nov 28 09:45:01 UTC 2020
Modified Files:
src/usr.bin/make: make.h
Log Message:
make(1): allow multiple RCS IDs in all-in-one mode
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/usr.bin/make/make.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.219 src/usr.bin/make/make.h:1.220
--- src/usr.bin/make/make.h:1.219 Tue Nov 24 20:17:17 2020
+++ src/usr.bin/make/make.h Sat Nov 28 09:45:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.219 2020/11/24 20:17:17 rillig Exp $ */
+/* $NetBSD: make.h,v 1.220 2020/11/28 09:45:01 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -836,6 +836,14 @@ pp_skip_hspace(char **pp)
# ifndef lint
# define MAKE_RCSID(id) __RCSID(id)
# endif
+#elif defined(MAKE_ALL_IN_ONE)
+# if defined(__COUNTER__)
+# define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y)
+# define MAKE_RCSID(id) static volatile char \
+ MAKE_RCSID_CONCAT(rcsid_, __COUNTER__)[] = id
+# else
+# define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
+# endif
#else
# define MAKE_RCSID(id) static volatile char rcsid[] = id
#endif
