diff options
author | Silvio Traversaro <silvio@traversaro.it> | 2019-08-21 10:48:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-21 10:48:49 +0200 |
commit | 7f1a5e55754cb97dcde8c7a63f5466bea5d5ab8b (patch) | |
tree | 0c96b5b7df91d6dacbeee6e5fbcb283793b68dbb /dlfcn.c | |
parent | e476c014827446c08430e4ee87c5417dd68150e3 (diff) | |
parent | ff3026745272b9aa61731ee4150735e2c5cfcb70 (diff) | |
download | dlfcn-win32-7f1a5e55754cb97dcde8c7a63f5466bea5d5ab8b.tar.gz dlfcn-win32-7f1a5e55754cb97dcde8c7a63f5466bea5d5ab8b.tar.bz2 dlfcn-win32-7f1a5e55754cb97dcde8c7a63f5466bea5d5ab8b.zip |
Merge pull request #59 from pali/master
Fix compile warnings
Diffstat (limited to 'dlfcn.c')
-rw-r--r-- | dlfcn.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -30,7 +30,6 @@ | |||
30 | 30 | ||
31 | #ifdef _MSC_VER | 31 | #ifdef _MSC_VER |
32 | /* https://docs.microsoft.com/en-us/cpp/intrinsics/returnaddress */ | 32 | /* https://docs.microsoft.com/en-us/cpp/intrinsics/returnaddress */ |
33 | #include <intrin.h> | ||
34 | #pragma intrinsic(_ReturnAddress) | 33 | #pragma intrinsic(_ReturnAddress) |
35 | #else | 34 | #else |
36 | /* https://gcc.gnu.org/onlinedocs/gcc/Return-Address.html */ | 35 | /* https://gcc.gnu.org/onlinedocs/gcc/Return-Address.html */ |
@@ -455,11 +454,7 @@ end: | |||
455 | save_err_str( name ); | 454 | save_err_str( name ); |
456 | } | 455 | } |
457 | 456 | ||
458 | // warning C4054: 'type cast' : from function pointer 'FARPROC' to data pointer 'void *' | 457 | return *(void **) (&symbol); |
459 | #ifdef _MSC_VER | ||
460 | #pragma warning( suppress: 4054 ) | ||
461 | #endif | ||
462 | return (void*) symbol; | ||
463 | } | 458 | } |
464 | 459 | ||
465 | char *dlerror( void ) | 460 | char *dlerror( void ) |