diff --git a/source/dynlink/include/dynlink/dynlink_impl_symbol_win32.h b/source/dynlink/include/dynlink/dynlink_impl_symbol_win32.h index 91554cf434..d1c946fc86 100644 --- a/source/dynlink/include/dynlink/dynlink_impl_symbol_win32.h +++ b/source/dynlink/include/dynlink/dynlink_impl_symbol_win32.h @@ -28,7 +28,8 @@ #include #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif /* -- Definitions -- */ @@ -44,25 +45,25 @@ extern "C" { } PREPROCESSOR_CONCAT(dynlink_no_export_, name) #if defined(__MINGW32__) || defined(__MINGW64__) - #define DYNLINK_SYMBOL_GET(name) \ - (((dynlink_symbol_addr_win32)(name))->symbol) - #else - #define DYNLINK_SYMBOL_GET(name) name + #define DYNLINK_SYMBOL_GET(name) \ + (((dynlink_symbol_addr_win32)(name))->symbol) +#else + #define DYNLINK_SYMBOL_GET(name) name #endif /* -- Type definitions -- */ #if defined(__MINGW32__) || defined(__MINGW64__) - /* MinGW-compatible definition */ - typedef void (*dynlink_symbol_addr_win32_impl)(void); - - typedef struct dynlink_symbol_addr_win32_type - { - dynlink_symbol_addr_win32_impl symbol; - } * dynlink_symbol_addr_win32; - +/* MinGW-compatible definition */ +typedef void (*dynlink_symbol_addr_win32_impl)(void); + +typedef struct dynlink_symbol_addr_win32_type +{ + dynlink_symbol_addr_win32_impl symbol; +} *dynlink_symbol_addr_win32; + #else - typedef void (*dynlink_symbol_addr_win32)(void); +typedef void (*dynlink_symbol_addr_win32)(void); #endif typedef dynlink_symbol_addr_win32 dynlink_symbol_addr; diff --git a/source/dynlink/source/dynlink_impl_win32.c b/source/dynlink/source/dynlink_impl_win32.c index 354adc8b2a..ff0a895336 100644 --- a/source/dynlink/source/dynlink_impl_win32.c +++ b/source/dynlink/source/dynlink_impl_win32.c @@ -76,16 +76,15 @@ int dynlink_impl_interface_symbol_win32(dynlink handle, dynlink_impl impl, dynli (void)handle; - - #if defined(__MINGW32__) || defined(__MINGW64__) - // For MinGW, set the symbol member of the struct - (*addr)->symbol = (dynlink_symbol_addr_win32_impl)proc_addr; - #else - // For MSVC or other compilers, cast directly - *addr = (dynlink_symbol_addr)proc_addr; - #endif - return (*addr == NULL); - } +#if defined(__MINGW32__) || defined(__MINGW64__) + // For MinGW, set the symbol member of the struct + (*addr)->symbol = (dynlink_symbol_addr_win32_impl)proc_addr; +#else + // For MSVC or other compilers, cast directly + *addr = (dynlink_symbol_addr)proc_addr; +#endif + return (*addr == NULL); +} int dynlink_impl_interface_unload_win32(dynlink handle, dynlink_impl impl) {