diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-06-17 09:40:37 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-06-17 09:40:37 +0000 |
| commit | 0e351e3b5561f1d66053434d1c248875e483f7ea (patch) | |
| tree | 56ae42764c461e1d136b8b86158d3a31bf4c4996 /editors/openoffice-2.0-devel/files | |
| parent | 4ddb0421096e424c407ca41ebcf4afc4bbfc68db (diff) | |
Notes
Diffstat (limited to 'editors/openoffice-2.0-devel/files')
| -rw-r--r-- | editors/openoffice-2.0-devel/files/Makefile.knobs | 4 | ||||
| -rw-r--r-- | editors/openoffice-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx | 25 |
2 files changed, 2 insertions, 27 deletions
diff --git a/editors/openoffice-2.0-devel/files/Makefile.knobs b/editors/openoffice-2.0-devel/files/Makefile.knobs index 9363f2709ec5..87743c8c490b 100644 --- a/editors/openoffice-2.0-devel/files/Makefile.knobs +++ b/editors/openoffice-2.0-devel/files/Makefile.knobs @@ -105,8 +105,8 @@ pre-fetch: @${ECHO} @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) - @${ECHO} "of free diskspace (~ 8GB)." + @${ECHO} "of free diskspace (~ 18GB)." .else - @${ECHO} "of free diskspace (~ 4GB)." + @${ECHO} "of free diskspace (~ 8.5GB)." .endif @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" diff --git a/editors/openoffice-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx deleted file mode 100644 index e07c8d33490c..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx +++ /dev/null @@ -1,25 +0,0 @@ -Issutracker : #i49681# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : powerof2() is already defined - -Index: canvas/inc/canvas/canvastools.hxx -=================================================================== -RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v -retrieving revision 1.7 -diff -u -r1.7 canvastools.hxx ---- canvas/inc/canvas/canvastools.hxx 30 Mar 2005 07:34:18 -0000 1.7 -+++ canvas/inc/canvas/canvastools.hxx 6 Apr 2005 01:22:58 -0000 -@@ -133,9 +133,9 @@ - */ - - // mickey's math tricks... -- inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; } -- inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); } -- inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); } -+ inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; } -+ inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); } -+ inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); } - template<typename T> - inline unsigned int bitcount( T c ) { - unsigned int nByteIndex = 0; |