Module Name:    src
Committed By:   christos
Date:           Thu Jun 18 19:49:08 UTC 2015

Modified Files:
        src/usr.bin/make: metachar.c

Log Message:
grr too many different compilation options.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/metachar.c

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/metachar.c
diff -u src/usr.bin/make/metachar.c:1.3 src/usr.bin/make/metachar.c:1.4
--- src/usr.bin/make/metachar.c:1.3	Thu Jun 18 11:51:57 2015
+++ src/usr.bin/make/metachar.c	Thu Jun 18 15:49:08 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: metachar.c,v 1.3 2015/06/18 15:51:57 christos Exp $	*/
+/*	$NetBSD: metachar.c,v 1.4 2015/06/18 19:49:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -28,13 +28,17 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: metachar.c,v 1.3 2015/06/18 15:51:57 christos Exp $";
-#else
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#if defined(MAKE_NATIVE) || defined(HAVE_NBTOOL_CONFIG_H)
 #include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: metachar.c,v 1.3 2015/06/18 15:51:57 christos Exp $");
-#endif /* not lint */
+#endif
+
+#if defined(__RCSID) && !defined(lint)
+__RCSID("$NetBSD: metachar.c,v 1.4 2015/06/18 19:49:08 christos Exp $");
 #endif
 
 #include "metachar.h"

Reply via email to