| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Index: proxy-libintl/src/proxy-libintl/libintl.c |
| 2 | =================================================================== |
| 3 | --- proxy-libintl.orig/src/proxy-libintl/libintl.c |
| 4 | +++ proxy-libintl/src/proxy-libintl/libintl.c |
| 5 | @@ -18,9 +18,12 @@ |
| 6 | */ |
| 7 | |
| 8 | #ifdef _WIN32 |
| 9 | -#include <windows.h> |
| 10 | +# include <windows.h> |
| 11 | #else |
| 12 | -#include <dlfcn.h> |
| 13 | +# include <stddef.h> |
| 14 | +# if !STUB_ONLY |
| 15 | +# include <dlfcn.h> |
| 16 | +# endif |
| 17 | typedef void* HMODULE; |
| 18 | #endif |
| 19 | |
| 20 | @@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese |
| 21 | static int |
| 22 | use_intl_dll (HMODULE dll) |
| 23 | { |
| 24 | -#ifdef _WIN32 |
| 25 | -#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 |
| 26 | -#else |
| 27 | -#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 |
| 28 | -#endif |
| 29 | +#if !STUB_ONLY |
| 30 | +# ifdef _WIN32 |
| 31 | +# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 |
| 32 | +# else |
| 33 | +# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 |
| 34 | +# endif /* _WIN32 */ |
| 35 | + |
| 36 | |
| 37 | LOOKUP (gettext); |
| 38 | LOOKUP (dgettext); |
| 39 | @@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll) |
| 40 | LOOKUP (bind_textdomain_codeset); |
| 41 | |
| 42 | #undef LOOKUP |
| 43 | - |
| 44 | +#endif /* !STUB_ONLY */ |
| 45 | return 1; |
| 46 | } |
| 47 | |
| 48 | @@ -171,13 +176,17 @@ setup (void) |
| 49 | |
| 50 | if (!beenhere) |
| 51 | { |
| 52 | -#ifdef _WIN32 |
| 53 | - HMODULE intl_dll = LoadLibrary ("intl.dll"); |
| 54 | -#elif defined(__APPLE__) && defined(__MACH__) |
| 55 | - HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); |
| 56 | -#else |
| 57 | - HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); |
| 58 | -#endif |
| 59 | +#if !STUB_ONLY |
| 60 | +# ifdef _WIN32 |
| 61 | + HMODULE intl_dll = LoadLibrary ("intl.dll"); |
| 62 | +# elif defined(__APPLE__) && defined(__MACH__) |
| 63 | + HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); |
| 64 | +# else |
| 65 | + HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); |
| 66 | +# endif |
| 67 | +#else /* !STUB_ONLY */ |
| 68 | + HMODULE intl_dll = NULL; |
| 69 | +#endif /* STUB_ONLY */ |
| 70 | |
| 71 | if (intl_dll != NULL && |
| 72 | use_intl_dll (intl_dll)) |