summaryrefslogtreecommitdiff
path: root/editors/openoffice-1.0/files
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-08-13 21:58:39 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-08-13 21:58:39 +0000
commit20bfa9f9b270aa1ff4ba3a6e2956d18835eada25 (patch)
tree22b316400df88a92d79939b1aa3156c73d81f1a7 /editors/openoffice-1.0/files
parentFix startup-script for -current /bin/sh issues, and set PREFIX during (diff)
Sort the array _nl_language_list[] in ascending order. Remove NetBSD
part of code which was wrong. Change a signed int to unsigned.
Notes
Notes: svn path=/head/; revision=64477
Diffstat (limited to 'editors/openoffice-1.0/files')
-rw-r--r--editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c81
-rw-r--r--editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c81
2 files changed, 104 insertions, 58 deletions
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
index 5fab5cf69c19..1a606f1694c1 100644
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
@@ -5,10 +5,19 @@
#include <osl/process.h>
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD)
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
+@@ -87,7 +87,7 @@
+ static int
+ _pair_compare (const char *key, const _pair *pair)
+ {
+- int result = rtl_str_compareIgnoreAsciiCase( key, pair->key );
++ unsigned int result = rtl_str_compareIgnoreAsciiCase( key, pair->key );
+ return result;
+ }
+
@@ -114,8 +114,7 @@
comparison = _pair_compare( key, base + current );
if (comparison < 0)
@@ -24,7 +33,7 @@
}
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD)
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -35,70 +44,84 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +312,30 @@
+@@ -260,6 +260,10 @@
+ #endif
+ #endif
+
++/*
++ * _nl_language_list[] is an array list of supported encodings. Because
++ * we are using a binary search, the list has to be in ascending order.
++ */
+
+ #if defined(SOLARIS)
+
+@@ -312,10 +316,33 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
-- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
+ { "sjis", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
+};
+
+#elif defined(FREEBSD)
+
+const _pair _nl_language_list[] = {
-+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
-+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
-+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
-+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
-+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
-+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
-+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
-+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
-+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
-+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R },
-+ { "KOI8-U", RTL_TEXTENCODING_DONTKNOW },
-+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
-+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
++ { "ascii", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
++ { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
++ { "cp1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
++ { "cp866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
++ { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
+ { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
+ { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
-+ { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */
-+ { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
-+ { "sjis", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
++ { "iso8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
++ { "iso8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
++ { "iso8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
++ { "iso8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
++ { "iso8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
++ { "iso8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
++ { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
++ { "koi-u", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */
++ { "koi8-r", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */
+ { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
++ { "us-ascii", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */
};
- #elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +519,7 @@
+-#elif defined(LINUX) || defined(NETBSD)
++#elif defined(LINUX)
+
+ const _pair _nl_language_list[] = {
+ { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */
+@@ -496,7 +523,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
-#endif /* ifdef LINUX || NETBSD */
-+#endif /* ifdef LINUX || NETBSD || FREEBSD */
++#endif /* ifdef LINUX || FREEBSD */
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +641,7 @@
+@@ -618,7 +645,7 @@
return ret;
}
-#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
-+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD || FREEBSD */
++#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || FREEBSD */
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +674,7 @@
+@@ -651,7 +678,7 @@
return 0;
}
-#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
++#else /* ifdef LINUX || SOLARIS || FREEBSD || MACOSX */
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +910,6 @@
+@@ -887,6 +914,6 @@
return 0;
}
-#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
++#endif /* ifdef LINUX || SOLARIS || MACOSX || FREEBSD */
diff --git a/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
index 5fab5cf69c19..1a606f1694c1 100644
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
+++ b/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
@@ -5,10 +5,19 @@
#include <osl/process.h>
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD)
#include <pthread.h>
#include <locale.h>
#include <langinfo.h>
+@@ -87,7 +87,7 @@
+ static int
+ _pair_compare (const char *key, const _pair *pair)
+ {
+- int result = rtl_str_compareIgnoreAsciiCase( key, pair->key );
++ unsigned int result = rtl_str_compareIgnoreAsciiCase( key, pair->key );
+ return result;
+ }
+
@@ -114,8 +114,7 @@
comparison = _pair_compare( key, base + current );
if (comparison < 0)
@@ -24,7 +33,7 @@
}
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
-+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD)
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -35,70 +44,84 @@
*
* This routine is SLOW because of the setlocale call, so
* grab the result and cache it.
-@@ -312,7 +312,30 @@
+@@ -260,6 +260,10 @@
+ #endif
+ #endif
+
++/*
++ * _nl_language_list[] is an array list of supported encodings. Because
++ * we are using a binary search, the list has to be in ascending order.
++ */
+
+ #if defined(SOLARIS)
+
+@@ -312,10 +316,33 @@
{ "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
{ "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
{ "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
-- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
+ { "sjis", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
+};
+
+#elif defined(FREEBSD)
+
+const _pair _nl_language_list[] = {
-+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
-+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
-+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
-+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
-+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
-+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
-+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
-+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
-+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
-+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R },
-+ { "KOI8-U", RTL_TEXTENCODING_DONTKNOW },
-+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
-+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
++ { "ascii", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
++ { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
++ { "cp1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
++ { "cp866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
++ { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
+ { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
+ { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
-+ { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */
-+ { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
-+ { "sjis", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
++ { "iso8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
++ { "iso8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
++ { "iso8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
++ { "iso8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
++ { "iso8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
++ { "iso8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
++ { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
++ { "koi-u", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */
++ { "koi8-r", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */
+ { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
++ { "us-ascii", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */
};
- #elif defined(LINUX) || defined(NETBSD)
-@@ -496,7 +519,7 @@
+-#elif defined(LINUX) || defined(NETBSD)
++#elif defined(LINUX)
+
+ const _pair _nl_language_list[] = {
+ { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */
+@@ -496,7 +523,7 @@
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
};
-#endif /* ifdef LINUX || NETBSD */
-+#endif /* ifdef LINUX || NETBSD || FREEBSD */
++#endif /* ifdef LINUX || FREEBSD */
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -618,7 +641,7 @@
+@@ -618,7 +645,7 @@
return ret;
}
-#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
-+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD || FREEBSD */
++#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || FREEBSD */
/*
* FIXME: the MacOS X implemetation is missing
-@@ -651,7 +674,7 @@
+@@ -651,7 +678,7 @@
return 0;
}
-#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
++#else /* ifdef LINUX || SOLARIS || FREEBSD || MACOSX */
/*
* This implementation of osl_getTextEncodingFromLocale maps
-@@ -887,6 +910,6 @@
+@@ -887,6 +914,6 @@
return 0;
}
-#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
-+#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
++#endif /* ifdef LINUX || SOLARIS || MACOSX || FREEBSD */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 20:23:16 +0000