diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-07-21 23:11:40 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-07-21 23:11:40 +0000 |
| commit | 2aede6e576d7ac8cfbaf57467cee5f778545b05d (patch) | |
| tree | 61988acc259033646da5849ec0fc328a3595be19 /editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c | |
| parent | Add correct map for rtti test too. (diff) | |
Fix language support. Add missing defines.
Notes
Notes:
svn path=/head/; revision=63345
Diffstat (limited to 'editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c')
| -rw-r--r-- | editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c index 807aeacda025..40154d65aca6 100644 --- a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Sun Mar 17 12:48:42 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Apr 3 00:57:03 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Sat Jul 20 22:42:15 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -9,7 +9,7 @@ #include <pthread.h> #include <locale.h> #include <langinfo.h> -@@ -242,7 +242,7 @@ +@@ -241,7 +241,7 @@ return NULL; } @@ -18,7 +18,16 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -314,7 +314,7 @@ +@@ -254,7 +254,7 @@ + * XXX this code has the usual mt problems aligned with setlocale() XXX + */ + +-#ifdef LINUX ++#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + #if !defined(CODESET) + #define CODESET _NL_CTYPE_CODESET_NAME + #endif +@@ -315,7 +315,7 @@ { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ }; @@ -27,7 +36,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -495,7 +495,7 @@ +@@ -496,7 +496,7 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -36,7 +45,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -617,7 +617,7 @@ +@@ -618,7 +618,7 @@ return ret; } @@ -45,7 +54,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -650,7 +650,7 @@ +@@ -651,7 +651,7 @@ return 0; } @@ -54,7 +63,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -884,6 +884,6 @@ +@@ -887,6 +887,6 @@ return 0; } |