wavegen.c: Fix -Wmissing-prototypes warnings.

src/libespeak-ng/compiledata.c

@@ -37,8 +37,8 @@
 #include "error.h"
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "spect.h"
 
 typedef struct {

src/libespeak-ng/compiledict.c

@@ -35,6 +35,7 @@
 #include "error.h"
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
 

src/libespeak-ng/compilembrola.c

@@ -31,6 +31,7 @@
 #include "error.h"
 #include "phoneme.h"
 #include "speech.h"
+#include "voice.h"
 #include "synthesize.h"
 
 static const char *basename(const char *filename)

src/libespeak-ng/dictionary.c

@@ -33,6 +33,7 @@
 
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
 

src/libespeak-ng/error.c

@@ -29,6 +29,7 @@
 #include "error.h"
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 
 espeak_ng_STATUS

src/libespeak-ng/espeak_api.c

@@ -29,6 +29,7 @@
 
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
 #include "event.h"

src/libespeak-ng/intonation.c

@@ -30,8 +30,8 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
 /* Note this module is mostly old code that needs to be rewritten to

src/libespeak-ng/klatt.c

@@ -37,8 +37,8 @@
 #include "speech.h"
 #include "klatt.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 
 extern unsigned char *out_ptr;
 extern unsigned char *out_start;

src/libespeak-ng/numbers.c

@@ -33,8 +33,8 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
 #define M_LIGATURE  0x8000

src/libespeak-ng/phonemelist.c

@@ -30,6 +30,7 @@
 
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
 

src/libespeak-ng/readclause.c

@@ -39,8 +39,8 @@
 #include "error.h"
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
 #define N_XML_BUF   500

src/libespeak-ng/setlengths.c

@@ -30,11 +30,10 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
-extern int GetAmplitude(void);
 extern void DoSonicSpeed(int value);
 extern int saved_parameters[];
 

src/libespeak-ng/spect.c

@@ -32,12 +32,11 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "spect.h"
 
 extern double ConvertFromIeeeExtended(unsigned char *bytes);
-extern int PeaksToHarmspect(wavegen_peaks_t *peaks, int pitch, int *htab, int control);
 
 extern unsigned char pk_shape1[];
 extern int pk_select;

src/libespeak-ng/speech.c

@@ -50,8 +50,8 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 #include "espeak_command.h"
 #include "fifo.h"

src/libespeak-ng/synth_mbrola.c

@@ -33,14 +33,13 @@
 
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
-#include "voice.h"
 
 #ifdef INCLUDE_MBROLA
 
 extern int Read4Bytes(FILE *f);
-extern void SetPitch2(voice_t *voice, int pitch1, int pitch2, int *pitch_base, int *pitch_range);
 extern unsigned char *outbuf;
 
 #if defined(_WIN32) || defined(_WIN64)

src/libespeak-ng/synthdata.c

@@ -34,8 +34,8 @@
 #include "error.h"
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
 const char *version_string = PACKAGE_VERSION;

src/libespeak-ng/synthesize.c

@@ -33,8 +33,8 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
 extern FILE *f_log;

src/libespeak-ng/synthesize.h

@@ -74,7 +74,6 @@ extern "C"
 extern int embedded_value[N_EMBEDDED_VALUES];
 extern int embedded_default[N_EMBEDDED_VALUES];
 
-#define N_PEAKS   9
 #define N_PEAKS2  9 // plus Notch and Fill (not yet implemented)
 #define N_MARKERS 8
 
@@ -453,14 +452,17 @@ extern int wcmdq_head;
 extern int wcmdq_tail;
 
 // from Wavegen file
-int  WcmdqFree();
-void WcmdqStop();
-int  WcmdqUsed();
-void WcmdqInc();
+int  WcmdqFree(void);
+void WcmdqStop(void);
+int  WcmdqUsed(void);
+void WcmdqInc(void);
 void WavegenInit(int rate, int wavemult_fact);
 float polint(float xa[], float ya[], int n, float x);
-int WavegenFill();
+int WavegenFill(void);
 void MarkerEvent(int type, unsigned int char_position, int value, int value2, unsigned char *out_ptr);
+int GetAmplitude(void);
+void SetPitch2(voice_t *voice, int pitch1, int pitch2, int *pitch_base, int *pitch_range);
+int PeaksToHarmspect(wavegen_peaks_t *peaks, int pitch, int *htab, int control);
 
 extern unsigned char *wavefile_data;
 extern int samplerate;

src/libespeak-ng/tr_languages.c

@@ -32,6 +32,7 @@
 
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
 

src/libespeak-ng/translate.c

@@ -33,8 +33,8 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
 Translator *translator = NULL; // the main translator

src/libespeak-ng/voice.h

@@ -22,6 +22,8 @@ extern "C"
 {
 #endif
 
+#define N_PEAKS   9
+
 typedef struct {
 	char v_name[40];
 	char language_name[20];

src/libespeak-ng/voices.c

@@ -40,8 +40,8 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 #include "translate.h"
 
 MNEM_TAB genders[] = {

src/libespeak-ng/wavegen.c

@@ -33,8 +33,8 @@
 
 #include "speech.h"
 #include "phoneme.h"
-#include "synthesize.h"
 #include "voice.h"
+#include "synthesize.h"
 
 #if HAVE_SONIC_H
 #include "sonic.h"
@@ -665,7 +665,7 @@ static int ApplyBreath(void)
 	return value;
 }
 
-int Wavegen()
+static int Wavegen()
 {
 	if (wvoice == NULL)
 		return 0;
@@ -1117,7 +1117,7 @@ void SetPitch2(voice_t *voice, int pitch1, int pitch2, int *pitch_base, int *pit
 	*pitch_range = base + (pitch2 * range)/2 - *pitch_base;
 }
 
-void SetPitch(int length, unsigned char *env, int pitch1, int pitch2)
+static void SetPitch(int length, unsigned char *env, int pitch1, int pitch2)
 {
 	if (wvoice == NULL)
 		return;
@@ -1140,7 +1140,7 @@ void SetPitch(int length, unsigned char *env, int pitch1, int pitch2)
 	flutter_amp = wvoice->flutter;
 }
 
-void SetSynth(int length, int modn, frame_t *fr1, frame_t *fr2, voice_t *v)
+static void SetSynth(int length, int modn, frame_t *fr1, frame_t *fr2, voice_t *v)
 {
 	if (wvoice == NULL || v == NULL)
 		return;
@@ -1246,7 +1246,7 @@ void Write4Bytes(FILE *f, int value)
 	}
 }
 
-int WavegenFill2()
+static int WavegenFill2()
 {
 	// Pick up next wavegen commands from the queue
 	// return: 0  output buffer has been filled

tests/api.c

@@ -28,6 +28,7 @@
 
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"
 

tests/readclause.c

@@ -31,6 +31,7 @@
 
 #include "speech.h"
 #include "phoneme.h"
+#include "voice.h"
 #include "synthesize.h"
 #include "translate.h"