From 205a57654fe68e50c5b613581af868f4eecad767 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 9 Jan 2016 18:52:18 +0000 Subject: [PATCH] The PROC* typedefs are no longer used, so remove them. --- src/libespeak-ng/mbrowrap.c | 18 +++++++++--------- src/libespeak-ng/mbrowrap.h | 14 +------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/libespeak-ng/mbrowrap.c b/src/libespeak-ng/mbrowrap.c index fe4bf7da..822ffd58 100644 --- a/src/libespeak-ng/mbrowrap.c +++ b/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; } diff --git a/src/libespeak-ng/mbrowrap.h b/src/libespeak-ng/mbrowrap.h index 8d9af7c5..604222bd 100644 --- a/src/libespeak-ng/mbrowrap.h +++ b/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 /*