[src/trunk]: src/gnu use:

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

details:   https://anonhg.NetBSD.org/src/rev/242bc730e0f3
branches:  trunk
changeset: 766612:242bc730e0f3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 29 01:59:26 2011 +0000

description:
use:
  extern "C" { stuff-here; }
instead of just
  extern "C" stuff-here;
that GCC 4.5 demands.

diffstat:

 gnu/dist/groff/src/libs/libgroff/Makefile.sub |  2 +-
 gnu/usr.bin/groff/src/libs/libgroff/Makefile  |  6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 36f392eb6ea4 -r 242bc730e0f3 gnu/dist/groff/src/libs/libgroff/Makefile.sub
--- a/gnu/dist/groff/src/libs/libgroff/Makefile.sub     Wed Jun 29 01:57:59 2011 +0000
+++ b/gnu/dist/groff/src/libs/libgroff/Makefile.sub     Wed Jun 29 01:59:26 2011 +0000
@@ -117,7 +117,7 @@
        @echo Making version.cpp
        @echo const char \*version_string = \"$(src_version)\"\; >$@
        @echo const char \*revision_string = \"$(src_revision)\"\; >>$@
-       @echo extern \"C\" const char \*Version_string = \"$(src_version).$(src_revision)\"\; | \
+       @echo extern \"C\" \{ const char \*Version_string = \"$(src_version).$(src_revision)\"\; \} | \
          sed -e 's/\.0\"/\"/' >>$@
 
 # We have to avoid $(COMPILE.c) since we must not use groff's `assert.h'
diff -r 36f392eb6ea4 -r 242bc730e0f3 gnu/usr.bin/groff/src/libs/libgroff/Makefile
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile      Wed Jun 29 01:57:59 2011 +0000
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile      Wed Jun 29 01:59:26 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.11 2011/06/29 01:59:26 mrg Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.5 2003/05/01 13:22:19 ru Exp $
 
@@ -24,13 +24,13 @@
 
 .include <bsd.lib.mk>
 
-version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
+version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION Makefile
        ${_MKTARGET_CREATE}
        (\
            v=`cat ${GROFF_DIST}/VERSION`;\
            r=`cat ${GROFF_DIST}/REVISION`;\
            echo 'const char *version_string = "'$$v'";' ;\
            echo 'const char *revision_string = "'$$r'";' ;\
-           echo 'extern "C" const char *Version_string = "'$$v'.'$$r'";' |\
+           echo 'extern "C" { const char *Version_string = "'$$v'.'$$r'"; }' |\
                ${TOOL_SED} -e 's/\.0\"/\"/'; \
        ) > ${.TARGET}