From 456aaec6274b8b6cd4a82974e448a242329e81af Mon Sep 17 00:00:00 2001 From: waltje Date: Tue, 9 May 2017 22:07:39 -0400 Subject: [PATCH] General cleanups. --- src/VIDEO/vid_voodoo.c | 2 +- src/config.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/VIDEO/vid_voodoo.c b/src/VIDEO/vid_voodoo.c index 815d071a6..57bb0084a 100644 --- a/src/VIDEO/vid_voodoo.c +++ b/src/VIDEO/vid_voodoo.c @@ -2215,7 +2215,7 @@ static __inline void voodoo_tmu_fetch(voodoo_t *voodoo, voodoo_params_t *params, #define dither2x2 (params->fbzMode & FBZ_DITHER_2x2) /*Perform texture fetch and blending for both TMUs*/ -static __inline voodoo_tmu_fetch_and_blend(voodoo_t *voodoo, voodoo_params_t *params, voodoo_state_t *state, int x) +static __inline void voodoo_tmu_fetch_and_blend(voodoo_t *voodoo, voodoo_params_t *params, voodoo_state_t *state, int x) { int r,g,b,a; int c_reverse, a_reverse; diff --git a/src/config.c b/src/config.c index f52cfd978..e97afe22e 100644 --- a/src/config.c +++ b/src/config.c @@ -795,8 +795,8 @@ void saveconfig(void) config_set_int(NULL, "netinterface", ethif); config_set_string(NULL, "netcard", network_card_get_internal_name(network_card_current)); - config_set_int(NULL, "maclocal", net2000_get_maclocal()); - config_set_int(NULL, "maclocal_pci", net2000_get_maclocal_pci()); + config_set_int(NULL, "maclocal", ne2000_get_maclocal()); + config_set_int(NULL, "maclocal_pci", ne2000_get_maclocal_pci()); config_set_string(NULL, "model", model_get_internal_name()); config_set_int(NULL, "cpu_manufacturer", cpu_manufacturer);