From 7874411c4d725539784e58c5e633f85c267292de Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Mon, 28 Dec 2015 11:29:16 +0000 Subject: [PATCH] Always include the #ifdef LIBRARY code. --- Makefile.am | 2 +- src/libespeak-ng/wavegen.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index ce5b26e8..8924bb34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,7 +83,7 @@ lib_LTLIBRARIES += src/libespeak-ng.la src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lpthread -lm src_libespeak_ng_la_CFLAGS = -Isrc/include/espeak-ng \ - -fPIC -fvisibility=hidden -D LIBRARY -D _BSD_SOURCE -D _POSIX_C_SOURCE=200112L \ + -fPIC -fvisibility=hidden -D _BSD_SOURCE -D _POSIX_C_SOURCE=200112L \ -pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\" src_libespeak_ng_la_SOURCES = \ src/libespeak-ng/compiledata.c \ diff --git a/src/libespeak-ng/wavegen.c b/src/libespeak-ng/wavegen.c index 18203da2..f2180157 100644 --- a/src/libespeak-ng/wavegen.c +++ b/src/libespeak-ng/wavegen.c @@ -391,9 +391,7 @@ static int WaveCallback(const void *inputBuffer, void *outputBuffer, } out_end2 = &outbuffer[pa_size]; // top of data needed for the portaudio buffer -#ifdef LIBRARY event_list_ix = 0; -#endif result = WavegenFill(1); @@ -411,7 +409,6 @@ static int WaveCallback(const void *inputBuffer, void *outputBuffer, p[-pa_size] = p[0]; out_ptr -= pa_size; -#ifdef LIBRARY count_samples += framesPerBuffer; if (synth_callback) { // synchronous-playback mode, allow the calling process to abort the speech @@ -423,7 +420,6 @@ static int WaveCallback(const void *inputBuffer, void *outputBuffer, result = 1; } } -#endif #ifdef ARCH_BIG // swap the order of bytes in each sound sample in the portaudio buffer