diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:41:42 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-18 22:41:42 +0000 |
commit | 5f6e7f6949fe1fba17b53a04af5b465f19b9b17d (patch) | |
tree | 336b116c7090225344e575c81b023f12aef39c5b /editors/openoffice.org-2/files/patch-tools::source::string::charset.cxx | |
parent | * add 2 missing man pages (diff) |
First step to make this port working. Configure works and all patches
apply now. There are still some compile errors to fix.
As you may see the patchnames are very long, but that makes
maintaining patches a lot easier.
Notes
Notes:
svn path=/head/; revision=68299
Diffstat (limited to 'editors/openoffice.org-2/files/patch-tools::source::string::charset.cxx')
-rw-r--r-- | editors/openoffice.org-2/files/patch-tools::source::string::charset.cxx | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/editors/openoffice.org-2/files/patch-tools::source::string::charset.cxx b/editors/openoffice.org-2/files/patch-tools::source::string::charset.cxx deleted file mode 100644 index ebee79ce414b..000000000000 --- a/editors/openoffice.org-2/files/patch-tools::source::string::charset.cxx +++ /dev/null @@ -1,36 +0,0 @@ ---- ../tools/source/string/charset.cxx.orig Sun Mar 10 23:55:47 2002 -+++ ../tools/source/string/charset.cxx Mon Mar 11 00:00:56 2002 -@@ -64,12 +64,14 @@ - #elif defined( OS2 ) - #define INCL_DOSNLS - #include <svpm.h> --#elif defined(LINUX) || defined(SOLARIS) -+#elif defined(LINUX) || defined(SOLARIS) || defined(FREEBSD) - #include <stdio.h> - #include <stdlib.h> - #include <strings.h> - #include <locale.h> -+#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(); |