From 85b111bc0792ab2cbb473aee33c945fd568e15e0 Mon Sep 17 00:00:00 2001 From: thor Date: Tue, 23 Jul 2019 08:45:34 +0000 Subject: [PATCH] intsym: formally include libsyn123, drop static git-svn-id: svn://scm.orgis.org/mpg123/trunk@4501 35dc7657-300d-0410-a2e5-dc2837fedb53 --- scripts/intsym.pl | 5 +++-- src/intsym.h | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/intsym.pl b/scripts/intsym.pl index b329084a..04326b6a 100644 --- a/scripts/intsym.pl +++ b/scripts/intsym.pl @@ -32,9 +32,10 @@ my @instances = libout123/wav libout123/out123_int libout123/stringlists + libsyn123/syn123_int )] , prefix => 'INT123_' -, apiprefix => 'mpg123_|out123_' +, apiprefix => 'mpg123_|out123_|syn123_' , conditional => { strerror=>'HAVE_STRERROR' } , symbols => [qw(COS9 tfcos36 pnts catchsignal)] # extra symbols } @@ -61,7 +62,7 @@ for my $i (@instances) if(/^([^\s\(#][^\(]*)\s\*?([a-z][a-z_0-9]+)\s*\(/) { # Skip preprocessing/comment stuff and official API. - unless($1 =~ '^#' or $1 =~ '/\*' or $2 =~ $apiex) + unless($1 =~ '^#' or $1 =~ '/\*' or $2 =~ $apiex or $1 =~ /\bstatic\b/) { push(@symbols, $2) unless grep {$_ eq $2} (keys %{$i->{conditional}}); } diff --git a/src/intsym.h b/src/intsym.h index 30d273c3..a76a448c 100644 --- a/src/intsym.h +++ b/src/intsym.h @@ -202,7 +202,6 @@ #define frame_set_seek INT123_frame_set_seek #define frame_tell_seek INT123_frame_tell_seek #define frame_fill_toc INT123_frame_fill_toc -#define getbits INT123_getbits #define getcpuflags INT123_getcpuflags #define icy2utf8 INT123_icy2utf8 #define init_icy INT123_init_icy @@ -220,8 +219,6 @@ #define fi_add INT123_fi_add #define fi_set INT123_fi_set #define fi_reset INT123_fi_reset -#define double_to_long_rounded INT123_double_to_long_rounded -#define scale_rounded INT123_scale_rounded #define decode_update INT123_decode_update #define decoder_synth_bytes INT123_decoder_synth_bytes #define samples_to_bytes INT123_samples_to_bytes