diff --git a/t-dll-api.cc b/t-dll-api.cc index a4e33852e..79bc73a2b 100644 --- a/t-dll-api.cc +++ b/t-dll-api.cc @@ -171,13 +171,6 @@ extern "C" unsigned ivl_expr_lineno(ivl_expr_t net) return net->lineno; } -inline static const char *basename(ivl_scope_t scope, const char *inst) -{ - inst += strlen(ivl_scope_name(scope)); - assert(*inst == '.'); - return inst+1; -} - extern "C" ivl_variable_type_t ivl_const_type(ivl_net_const_t net) { assert(net); diff --git a/t-dll.cc b/t-dll.cc index 23be1f7ce..c3ad49d0e 100644 --- a/t-dll.cc +++ b/t-dll.cc @@ -151,13 +151,6 @@ void ivl_net_const_s::operator delete(void*, size_t) static StringHeapLex net_const_strings; -inline static const char *basename(ivl_scope_t scope, const char *inst) -{ - inst += strlen(ivl_scope_name(scope)); - assert(*inst == '.'); - return inst+1; -} - static perm_string make_scope_name(const hname_t&name) { if (! name.has_numbers()) diff --git a/vpi/Makefile.in b/vpi/Makefile.in index fe35b07c6..30e537784 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -56,7 +56,7 @@ O = sys_table.o sys_convert.o sys_countdrivers.o sys_darray.o sys_deposit.o sys_ sys_random.o sys_random_mti.o sys_readmem.o sys_readmem_lex.o sys_scanf.o \ sys_sdf.o sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o \ sys_priv.o sdf_parse.o sdf_lexor.o stringheap.o vams_simparam.o \ - table_mod.o table_mod_lexor.o table_mod_parse.o + table_mod.o table_mod_parse.o table_mod_lexor.o OPP = vcd_priv2.o ifeq (@HAVE_LIBZ@,yes) diff --git a/vpi/sys_scanf.c b/vpi/sys_scanf.c index f05b6245f..2e86cae2d 100644 --- a/vpi/sys_scanf.c +++ b/vpi/sys_scanf.c @@ -20,6 +20,7 @@ /* round() is ISO C99 from math.h. This define should enable it. */ # define _ISOC99_SOURCE 1 # define _SVID_SOURCE 1 +# define _DEFAULT_SOURCE 1 # include "sys_priv.h" # include diff --git a/vpi/table_mod_parse.y b/vpi/table_mod_parse.y index 1ded2cae3..4ba043d10 100644 --- a/vpi/table_mod_parse.y +++ b/vpi/table_mod_parse.y @@ -1,7 +1,7 @@ %{ /* - * Copyright (C) 2011-2014 Cary R. (cygcary@yahoo.com) + * Copyright (C) 2011-2015 Cary R. (cygcary@yahoo.com) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -228,7 +228,7 @@ void yyerror(const char *fmt, ...) { va_list ap; va_start(ap, fmt); - fprintf(stderr, "%s:%u: TABLE ERROR: ", in_file_name, + fprintf(stderr, "%s:%d: TABLE ERROR: ", in_file_name, yylloc.first_line-1); vfprintf(stderr, fmt, ap); va_end(ap);