[src/trunk]: src/external/gpl3 protect the entire contents of regsub.c with e...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/61a0668b9bbe
branches:  trunk
changeset: 343058:61a0668b9bbe
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jan 21 04:55:40 2016 +0000

description:
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.

diffstat:

 external/gpl3/gcc.old/dist/gcc/regsub.c |  8 ++++++--
 external/gpl3/gcc/dist/gcc/regsub.c     |  7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 1e9dcb280c73 -r 61a0668b9bbe external/gpl3/gcc.old/dist/gcc/regsub.c
--- a/external/gpl3/gcc.old/dist/gcc/regsub.c   Wed Jan 20 22:12:22 2016 +0000
+++ b/external/gpl3/gcc.old/dist/gcc/regsub.c   Thu Jan 21 04:55:40 2016 +0000
@@ -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 @@
        *buf = NULL;
        return regsub1(buf, REINCR, sub, rm, str);
 }
+
+}
diff -r 1e9dcb280c73 -r 61a0668b9bbe external/gpl3/gcc/dist/gcc/regsub.c
--- a/external/gpl3/gcc/dist/gcc/regsub.c       Wed Jan 20 22:12:22 2016 +0000
+++ b/external/gpl3/gcc/dist/gcc/regsub.c       Thu Jan 21 04:55:40 2016 +0000
@@ -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 @@
        *buf = NULL;
        return regsub1(buf, REINCR, sub, rm, str);
 }
+
+}