Module Name: src
Committed By: christos
Date: Mon Aug 20 10:26:59 UTC 2018
Modified Files:
src/external/bsd/flex/dist/src: flexdef.h
Log Message:
avoid redefinition of the package macros.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/flexdef.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/dist/src/flexdef.h
diff -u src/external/bsd/flex/dist/src/flexdef.h:1.5 src/external/bsd/flex/dist/src/flexdef.h:1.6
--- src/external/bsd/flex/dist/src/flexdef.h:1.5 Mon Aug 20 06:24:17 2018
+++ src/external/bsd/flex/dist/src/flexdef.h Mon Aug 20 06:26:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: flexdef.h,v 1.5 2018/08/20 10:24:17 kre Exp $ */
+/* $NetBSD: flexdef.h,v 1.6 2018/08/20 10:26:58 christos Exp $ */
/* flexdef - definitions file for flex */
@@ -36,8 +36,14 @@
#ifndef FLEXDEF_H
#define FLEXDEF_H 1
-#if !defined(_NETBSD_SOURCE) && HAVE_NBTOOL_CONFIG_H
+#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_URL
+#undef PACKAGE_VERSION
#endif
#ifdef HAVE_CONFIG_H
