diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 13:37:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 13:37:22 +0000 |
| commit | 447d4fc77db38219e6e9821aaa5ce4be8574b0da (patch) | |
| tree | 4b3e43dc914687727f089f295b7ec2f8435d34ff /stoc/source | |
| parent | ed42bda0937fdca0ea4e5e2a95b31ab0e7e145cb (diff) | |
INTEGRATION: CWS geordi2q11 (1.8.64); FILE MERGED
2003/12/16 16:18:25 hr 1.8.64.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'stoc/source')
| -rw-r--r-- | stoc/source/corereflection/criface.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index ddbf86af5d87..0af5634264c7 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -2,9 +2,9 @@ * * $RCSfile: criface.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-03-27 12:00:40 $ + * last change: $Author: vg $ $Date: 2003-12-17 14:37:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,7 +65,7 @@ #include <alloca.h> #endif #endif -#ifndef MACOSX +#if !(defined(MACOSX) || defined(FREEBSD)) #include <malloc.h> #endif #ifndef _RTL_ALLOC_H_ |