The PROC* typedefs are no longer used, so remove them.

src/libespeak-ng/mbrowrap.c

@@ -36,15 +36,15 @@ BOOL load_MBR()
 
 	if ((hinstDllMBR = LoadLibraryA("mbrola.dll")) == 0)
 		return FALSE;
-	init_MBR = (PROCIC)GetProcAddress(hinstDllMBR, "init_MBR");
-	write_MBR = (PROCIC)GetProcAddress(hinstDllMBR, "write_MBR");
-	flush_MBR = (PROCIV)GetProcAddress(hinstDllMBR, "flush_MBR");
-	read_MBR = (PROCISI)GetProcAddress(hinstDllMBR, "read_MBR");
-	close_MBR = (PROCVV)GetProcAddress(hinstDllMBR, "close_MBR");
-	reset_MBR = (PROCVV)GetProcAddress(hinstDllMBR, "reset_MBR");
-	lastErrorStr_MBR = (PROCVCI)GetProcAddress(hinstDllMBR, "lastErrorStr_MBR");
-	setNoError_MBR = (PROCVI)GetProcAddress(hinstDllMBR, "setNoError_MBR");
-	setVolumeRatio_MBR = (PROCVF)GetProcAddress(hinstDllMBR, "setVolumeRatio_MBR");
+	init_MBR = (void *)GetProcAddress(hinstDllMBR, "init_MBR");
+	write_MBR = (void *)GetProcAddress(hinstDllMBR, "write_MBR");
+	flush_MBR = (void *)GetProcAddress(hinstDllMBR, "flush_MBR");
+	read_MBR = (void *)GetProcAddress(hinstDllMBR, "read_MBR");
+	close_MBR = (void *)GetProcAddress(hinstDllMBR, "close_MBR");
+	reset_MBR = (void *)GetProcAddress(hinstDllMBR, "reset_MBR");
+	lastErrorStr_MBR = (void *)GetProcAddress(hinstDllMBR, "lastErrorStr_MBR");
+	setNoError_MBR = (void *)GetProcAddress(hinstDllMBR, "setNoError_MBR");
+	setVolumeRatio_MBR = (void *)GetProcAddress(hinstDllMBR, "setVolumeRatio_MBR");
 	return TRUE;
 }
 

src/libespeak-ng/mbrowrap.h

@@ -24,21 +24,9 @@ extern "C"
 {
 #endif
 
-#if defined(_WIN32) || defined(_WIN64)
-
-typedef void (WINAPI *PROCVV)(void);
-typedef void (WINAPI *PROCVI)(int);
-typedef void (WINAPI *PROCVF)(float);
-typedef int (WINAPI *PROCIV)(void);
-typedef int (WINAPI *PROCIC)(char *);
-typedef int (WINAPI *PROCISI)(short *, int);
-typedef char * (WINAPI *PROCVCI)(char *, int);
-
-#else
-
+#if !defined(_WIN32) && !defined(_WIN64)
 #define WINAPI
 typedef int BOOL;
-
 #endif
 
 /*