diff options
| author | Geoffrey Wossum <gwossum@acm.org> | 2008-08-19 23:44:17 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-08-19 23:44:17 +0000 |
| commit | f05affe9543605247dd9621e29567cdb49e39d2e (patch) | |
| tree | b9a54910162278c2b77510106d521a172a83a96e /packages/proxy-libintl/proxy-libintl-20080418 | |
| parent | 30180b8ef19dac735e61897b3b9e5d4fed284990 (diff) | |
proxy-libintl: From #4370, dummy replacement for gettext.
Diffstat (limited to 'packages/proxy-libintl/proxy-libintl-20080418')
| -rw-r--r-- | packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch | 72 |
2 files changed, 72 insertions, 0 deletions
diff --git a/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty b/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty diff --git a/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch b/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch new file mode 100644 index 0000000000..7186b13c06 --- /dev/null +++ b/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch @@ -0,0 +1,72 @@ +Index: proxy-libintl/src/proxy-libintl/libintl.c +=================================================================== +--- proxy-libintl.orig/src/proxy-libintl/libintl.c ++++ proxy-libintl/src/proxy-libintl/libintl.c +@@ -18,9 +18,12 @@ + */ + + #ifdef _WIN32 +-#include <windows.h> ++# include <windows.h> + #else +-#include <dlfcn.h> ++# include <stddef.h> ++# if !STUB_ONLY ++# include <dlfcn.h> ++# endif + typedef void* HMODULE; + #endif + +@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese + static int + use_intl_dll (HMODULE dll) + { +-#ifdef _WIN32 +-#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 +-#else +-#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 +-#endif ++#if !STUB_ONLY ++# ifdef _WIN32 ++# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 ++# else ++# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 ++# endif /* _WIN32 */ ++ + + LOOKUP (gettext); + LOOKUP (dgettext); +@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll) + LOOKUP (bind_textdomain_codeset); + + #undef LOOKUP +- ++#endif /* !STUB_ONLY */ + return 1; + } + +@@ -171,13 +176,17 @@ setup (void) + + if (!beenhere) + { +-#ifdef _WIN32 +- HMODULE intl_dll = LoadLibrary ("intl.dll"); +-#elif defined(__APPLE__) && defined(__MACH__) +- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); +-#else +- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); +-#endif ++#if !STUB_ONLY ++# ifdef _WIN32 ++ HMODULE intl_dll = LoadLibrary ("intl.dll"); ++# elif defined(__APPLE__) && defined(__MACH__) ++ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); ++# else ++ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); ++# endif ++#else /* !STUB_ONLY */ ++ HMODULE intl_dll = NULL; ++#endif /* STUB_ONLY */ + + if (intl_dll != NULL && + use_intl_dll (intl_dll)) |