diff options
| author | mbr <mbr@FreeBSD.org> | 2002-03-11 17:06:34 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-03-11 17:06:34 +0800 |
| commit | bc542d57401dff5cf8eb373c2ada0e72e44078d9 (patch) | |
| tree | af25df08755f610e58d4e10b273c80984b8657ba /editors/openoffice.org-1.1 | |
| parent | a707f927a8cac63e3fb70167487c19fcc7a46ac1 (diff) | |
| download | freebsd-ports-gnome-bc542d57401dff5cf8eb373c2ada0e72e44078d9.tar.gz freebsd-ports-gnome-bc542d57401dff5cf8eb373c2ada0e72e44078d9.tar.zst freebsd-ports-gnome-bc542d57401dff5cf8eb373c2ada0e72e44078d9.zip | |
Fix one #ifdef and add two more checks
Diffstat (limited to 'editors/openoffice.org-1.1')
| -rw-r--r-- | editors/openoffice.org-1.1/files/patch-tools::source::string::charset.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/editors/openoffice.org-1.1/files/patch-tools::source::string::charset.cxx b/editors/openoffice.org-1.1/files/patch-tools::source::string::charset.cxx index d59b855eb86f..ebee79ce414b 100644 --- a/editors/openoffice.org-1.1/files/patch-tools::source::string::charset.cxx +++ b/editors/openoffice.org-1.1/files/patch-tools::source::string::charset.cxx @@ -1,5 +1,5 @@ --- ../tools/source/string/charset.cxx.orig Sun Mar 10 23:55:47 2002 -+++ ../tools/source/string/charset.cxx Sun Mar 10 23:57:30 2002 ++++ ../tools/source/string/charset.cxx Mon Mar 11 00:00:56 2002 @@ -64,12 +64,14 @@ #elif defined( OS2 ) #define INCL_DOSNLS @@ -10,9 +10,27 @@ #include <stdlib.h> #include <strings.h> #include <locale.h> -+if !defined(FREEBSD) || OSVERSION > 500000 ++#if !defined(FREEBSD) || OSVERSION > 500000 #include <langinfo.h> +#endif #ifndef _TOOLS_LANG_HXX #include <lang.hxx> #endif +@@ -126,7 +128,7 @@ + + // ----------------------------------------------------------------------- + +-#if defined(NETBSD) || defined(SCO) ++#if defined(NETBSD) || defined(SCO) || defined(FREEBSD) + + // check if there is a charset qualifier at the end of the given locale string + // e.g. de.ISO8859-15 or de.ISO8859-15@euro which strongly indicates what +@@ -707,7 +709,7 @@ + #ifdef UNX + CharSet nTextEncoding; + +-#if defined(NETBSD) || defined(SCO) ++#if defined(NETBSD) || defined(SCO) || defined(FREEBSD) + nTextEncoding = GetSystemCharSetFromEnvironment(); + if (nTextEncoding == RTL_TEXTENCODING_DONTKNOW) + nTextEncoding = GetSystemCharSetFromSystemLanguage(); |