Module Name: src
Committed By: mrg
Date: Thu Jan 21 04:55:40 UTC 2016
Modified Files:
src/external/gpl3/gcc.old/dist/gcc: regsub.c
src/external/gpl3/gcc/dist/gcc: regsub.c
Log Message:
protect the entire contents of regsub.c with extern "C".
this fixes the tools build, at least.
also, remove the no longer needed cdefs.h from one of these copies.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc.old/dist/gcc/regsub.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/regsub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/dist/gcc/regsub.c
diff -u src/external/gpl3/gcc.old/dist/gcc/regsub.c:1.3 src/external/gpl3/gcc.old/dist/gcc/regsub.c:1.4
--- src/external/gpl3/gcc.old/dist/gcc/regsub.c:1.3 Wed Jan 20 15:12:29 2016
+++ src/external/gpl3/gcc.old/dist/gcc/regsub.c Thu Jan 21 04:55:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: regsub.c,v 1.3 2016/01/20 15:12:29 christos Exp $ */
+/* $NetBSD: regsub.c,v 1.4 2016/01/21 04:55:40 mrg Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -28,7 +28,9 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
+
+extern "C" {
+
#include <sys/param.h>
#include <ctype.h>
#include <stdlib.h>
@@ -158,3 +160,5 @@ regasub(char **buf, const char *sub, con
*buf = NULL;
return regsub1(buf, REINCR, sub, rm, str);
}
+
+}
Index: src/external/gpl3/gcc/dist/gcc/regsub.c
diff -u src/external/gpl3/gcc/dist/gcc/regsub.c:1.3 src/external/gpl3/gcc/dist/gcc/regsub.c:1.4
--- src/external/gpl3/gcc/dist/gcc/regsub.c:1.3 Wed Jan 20 15:13:33 2016
+++ src/external/gpl3/gcc/dist/gcc/regsub.c Thu Jan 21 04:55:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: regsub.c,v 1.3 2016/01/20 15:13:33 christos Exp $ */
+/* $NetBSD: regsub.c,v 1.4 2016/01/21 04:55:40 mrg Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -28,6 +28,9 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
+extern "C" {
+
#include <sys/param.h>
#include <ctype.h>
#include <stdlib.h>
@@ -157,3 +160,5 @@ regasub(char **buf, const char *sub, con
*buf = NULL;
return regsub1(buf, REINCR, sub, rm, str);
}
+
+}
