diff --git a/src/arch/festival/server.cc b/src/arch/festival/server.cc index 2ec6c6e..8fc47b5 100644 --- a/src/arch/festival/server.cc +++ b/src/arch/festival/server.cc @@ -122,7 +122,7 @@ int festival_start_server(int port) serv_addr.sin_port = htons(port); serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); - if (bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0) + if (::bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0) { cerr << "socket: bind failed" << endl; festival_error(); diff --git a/src/modules/clunits/acost.cc b/src/modules/clunits/acost.cc index d12ca9c..a18a479 100644 --- a/src/modules/clunits/acost.cc +++ b/src/modules/clunits/acost.cc @@ -46,6 +46,7 @@ /* */ /*=======================================================================*/ #include +#include #include "festival.h" #include "clunits.h" @@ -196,7 +197,7 @@ static void cumulate_ss_frames(EST_Track *a,EST_SuffStats *ss_frames) for (j=0; j < a->num_channels(); j++) { p = a->a_no_check(i,j); - if (!finite(p)) + if (!std::isfinite(p)) { p = 1.0e5; a->a_no_check(i,j) = p;