Date: Tue, 14 May 2013 19:16:54 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r250638 - in projects/flex-sf: contrib/flex usr.bin/lex/lib Message-ID: <201305141916.r4EJGs2Y056601@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue May 14 19:16:54 2013 New Revision: 250638 URL: http://svnweb.freebsd.org/changeset/base/250638 Log: Fix build with GCC. Modified: projects/flex-sf/contrib/flex/gen.c projects/flex-sf/contrib/flex/libyywrap.c projects/flex-sf/contrib/flex/misc.c projects/flex-sf/contrib/flex/scanflags.c projects/flex-sf/usr.bin/lex/lib/Makefile Modified: projects/flex-sf/contrib/flex/gen.c ============================================================================== --- projects/flex-sf/contrib/flex/gen.c Tue May 14 17:32:13 2013 (r250637) +++ projects/flex-sf/contrib/flex/gen.c Tue May 14 19:16:54 2013 (r250638) @@ -121,7 +121,7 @@ static struct yytbl_data *mkeoltbl (void } /* Generate the table for possible eol matches. */ -static void geneoltbl () +static void geneoltbl (void) { int i; Modified: projects/flex-sf/contrib/flex/libyywrap.c ============================================================================== --- projects/flex-sf/contrib/flex/libyywrap.c Tue May 14 17:32:13 2013 (r250637) +++ projects/flex-sf/contrib/flex/libyywrap.c Tue May 14 19:16:54 2013 (r250638) @@ -21,6 +21,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ +int yywrap (void); int yywrap (void) { return 1; Modified: projects/flex-sf/contrib/flex/misc.c ============================================================================== --- projects/flex-sf/contrib/flex/misc.c Tue May 14 17:32:13 2013 (r250637) +++ projects/flex-sf/contrib/flex/misc.c Tue May 14 19:16:54 2013 (r250638) @@ -113,6 +113,7 @@ void action_define (defname, value) } +#ifdef notdef /** Append "m4_define([[defname]],[[value]])m4_dnl\n" to the running buffer. * @param defname The macro name. * @param value The macro value, can be NULL, which is the same as the empty string. @@ -133,6 +134,7 @@ static void action_m4_define (const char snprintf (buf, sizeof(buf), "m4_define([[%s]],[[%s]])m4_dnl\n", defname, value?value:""); add_action (buf); } +#endif /* Append "new_text" to the running buffer. */ void add_action (new_text) Modified: projects/flex-sf/contrib/flex/scanflags.c ============================================================================== --- projects/flex-sf/contrib/flex/scanflags.c Tue May 14 17:32:13 2013 (r250637) +++ projects/flex-sf/contrib/flex/scanflags.c Tue May 14 19:16:54 2013 (r250638) @@ -62,7 +62,7 @@ sf_init (void) _sf_stk = (scanflags_t*) flex_alloc ( sizeof(scanflags_t) * (_sf_max = 32)); if (!_sf_stk) lerrsf_fatal(_("Unable to allocate %ld of stack"), - (long)sizeof(scanflags_t)); + (void *)(uintptr_t)sizeof(scanflags_t)); _sf_stk[_sf_top_ix] = 0; } Modified: projects/flex-sf/usr.bin/lex/lib/Makefile ============================================================================== --- projects/flex-sf/usr.bin/lex/lib/Makefile Tue May 14 17:32:13 2013 (r250637) +++ projects/flex-sf/usr.bin/lex/lib/Makefile Tue May 14 19:16:54 2013 (r250638) @@ -8,8 +8,6 @@ LIB= ln SRCS= libmain.c libyywrap.c NO_PIC= -WARNS?= 2 - .if ${MK_INSTALLLIB} != "no" LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305141916.r4EJGs2Y056601>