Author: ed
Date: Thu May 23 18:07:01 2013
New Revision: 250938
URL: http://svnweb.freebsd.org/changeset/base/250938
Log:
Let iconv build on -HEAD properly.
- Add NO_WMISSING_VARIABLE_DECLARATIONS where we use Yacc/Lex.
- Add variable declarations where possible.
- Add missing static keyword.
Modified:
head/lib/libc/iconv/citrus_iconv_local.h
head/lib/libc/iconv/citrus_mapper_local.h
head/lib/libc/iconv/citrus_stdenc_local.h
head/usr.bin/iconv/iconv.c
head/usr.bin/mkcsmapper/Makefile
head/usr.bin/mkesdb/Makefile
Modified: head/lib/libc/iconv/citrus_iconv_local.h
==============================================================================
--- head/lib/libc/iconv/citrus_iconv_local.h Thu May 23 16:39:42 2013
(r250937)
+++ head/lib/libc/iconv/citrus_iconv_local.h Thu May 23 18:07:01 2013
(r250938)
@@ -57,6 +57,7 @@ static void _citrus_##_m_##_iconv_unini
#define _CITRUS_ICONV_DEF_OPS(_m_) \
+extern struct _citrus_iconv_ops _citrus_##_m_##_iconv_ops; \
struct _citrus_iconv_ops _citrus_##_m_##_iconv_ops = { \
/* io_init_shared */ &_citrus_##_m_##_iconv_init_shared, \
/* io_uninit_shared */ &_citrus_##_m_##_iconv_uninit_shared, \
Modified: head/lib/libc/iconv/citrus_mapper_local.h
==============================================================================
--- head/lib/libc/iconv/citrus_mapper_local.h Thu May 23 16:39:42 2013
(r250937)
+++ head/lib/libc/iconv/citrus_mapper_local.h Thu May 23 18:07:01 2013
(r250938)
@@ -52,6 +52,7 @@ static void _citrus_##_m_##_mapper_init
(void);
#define _CITRUS_MAPPER_DEF_OPS(_m_) \
+extern struct _citrus_mapper_ops _citrus_##_m_##_mapper_ops; \
struct _citrus_mapper_ops _citrus_##_m_##_mapper_ops = { \
/* mo_init */ &_citrus_##_m_##_mapper_init, \
/* mo_uninit */ &_citrus_##_m_##_mapper_uninit, \
Modified: head/lib/libc/iconv/citrus_stdenc_local.h
==============================================================================
--- head/lib/libc/iconv/citrus_stdenc_local.h Thu May 23 16:39:42 2013
(r250937)
+++ head/lib/libc/iconv/citrus_stdenc_local.h Thu May 23 18:07:01 2013
(r250938)
@@ -84,6 +84,7 @@ static int _citrus_##_e_##_stdenc_get_s
struct _citrus_stdenc_state_desc * __restrict)
#define _CITRUS_STDENC_DEF_OPS(_e_) \
+extern struct _citrus_stdenc_ops _citrus_##_e_##_stdenc_ops; \
struct _citrus_stdenc_ops _citrus_##_e_##_stdenc_ops = { \
/* eo_init */ &_citrus_##_e_##_stdenc_init, \
/* eo_uninit */ &_citrus_##_e_##_stdenc_uninit, \
Modified: head/usr.bin/iconv/iconv.c
==============================================================================
--- head/usr.bin/iconv/iconv.c Thu May 23 16:39:42 2013 (r250937)
+++ head/usr.bin/iconv/iconv.c Thu May 23 18:07:01 2013 (r250938)
@@ -47,8 +47,7 @@ static void do_conv(FILE *, const char
static int do_list(unsigned int, const char * const *, void *);
static void usage(void);
-struct option long_options[] =
-{
+static struct option long_options[] = {
{"from-code", required_argument, NULL, 'f'},
{"list", no_argument, NULL, 'l'},
{"silent", no_argument, NULL, 's'},
Modified: head/usr.bin/mkcsmapper/Makefile
==============================================================================
--- head/usr.bin/mkcsmapper/Makefile Thu May 23 16:39:42 2013
(r250937)
+++ head/usr.bin/mkcsmapper/Makefile Thu May 23 18:07:01 2013
(r250938)
@@ -5,5 +5,7 @@
PROG= mkcsmapper
LDFLAGS+= -L${.CURDIR}/../../lib/libc
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
.include "${.CURDIR}/Makefile.inc"
.include <bsd.prog.mk>
Modified: head/usr.bin/mkesdb/Makefile
==============================================================================
--- head/usr.bin/mkesdb/Makefile Thu May 23 16:39:42 2013
(r250937)
+++ head/usr.bin/mkesdb/Makefile Thu May 23 18:07:01 2013
(r250938)
@@ -5,5 +5,7 @@
PROG= mkesdb
LDFLAGS+= -L${.OBJDIR}/../../lib/libc
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
.include "${.CURDIR}/Makefile.inc"
.include <bsd.prog.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
