diff options
author | Maho Nakata <maho@FreeBSD.org> | 2003-07-17 12:56:09 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2003-07-17 12:56:09 +0000 |
commit | af63e06d7ced8eee4d23ad8ef955041253de3bde (patch) | |
tree | 2b98da8cfdde634ba0a921b96c8a585e50525a90 /editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c | |
parent | Upgrade to 20030716. (diff) |
1. update to fresh checkout of OpenOffice.org (1.1RC2)
tagged under cws_srx645_ooo11rc2
2. still broken with installation failure.
Reviewed by: mbr
Notes
Notes:
svn path=/head/; revision=85048
Diffstat (limited to 'editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c')
-rw-r--r-- | editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c deleted file mode 100644 index e866f598af30..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+system.c +++ /dev/null @@ -1,91 +0,0 @@ ---- ../sal/osl/unx/system.c.orig Tue Aug 20 08:49:46 2002 -+++ ../sal/osl/unx/system.c Mon Apr 21 02:42:21 2003 -@@ -74,7 +74,8 @@ - static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; - - /* struct passwd differs on some platforms */ --#if defined NETBSD || defined MACOSX || defined FREEBSD -+#if defined NETBSD || defined MACOSX || \ -+ (defined FREEBSD && (__FreeBSD_version < 500112)) - #include <pwd.h> - #include <sys/types.h> - -@@ -134,7 +135,6 @@ - return res; - } - --#if defined(NETBSD) || defined(MACOSX) - int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, - size_t buflen, struct passwd **result) - { -@@ -201,8 +201,8 @@ - - return res; - } --#endif - -+#if defined NETBSD || defined MACOSX - struct tm *localtime_r(const time_t *timep, struct tm *buffer) - { - struct tm* res; -@@ -236,7 +236,8 @@ - - return res; - } --#endif /* defined NETBSD || defined MACOSX */ -+#endif /* defined NETBSD || MACOSX */ -+#endif /* defined NETBSD || FREEBSD || MACOSX */ - - #ifdef SCO - #include <pwd.h> -@@ -712,3 +713,50 @@ - } - #endif - -+#if defined(NETBSD) || defined(FREEBSD) -+char *fcvt(double value, int ndigit, int *decpt, int *sign) -+{ -+ static char ret[256]; -+ char buf[256],zahl[256],format[256]="%"; -+ char *v1,*v2; -+ -+ if (value==0.0) value=1e-30; -+ -+ if (value<0.0) *sign=1; else *sign=0; -+ -+ if (value<1.0) -+ { -+ *decpt=(int)log10(value); -+ value*=pow(10.0,1-*decpt); -+ ndigit+=*decpt-1; -+ if (ndigit<0) ndigit=0; -+ } -+ else -+ { -+ *decpt=(int)log10(value)+1; -+ } -+ -+ sprintf(zahl,"%d",ndigit); -+ strcat(format,zahl); -+ strcat(format,"."); -+ strcat(format,zahl); -+ strcat(format,"f"); -+ -+ sprintf(buf,format,value); -+ -+ if (ndigit!=0) -+ { -+ v1=strtok(buf,"."); -+ v2=strtok(NULL,"."); -+ strcpy(ret,v1); -+ strcat(ret,v2); -+ } -+ else -+ { -+ strcpy(ret,buf); -+ } -+ -+ return(ret); -+} -+ -+#endif |