diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-02-15 23:55:17 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-02-15 23:55:17 +0000 |
| commit | 11a56d42cd9c06ab2c29a55dbc9a9d864608f87d (patch) | |
| tree | 8ceab9f83b6d2dc5784be738fe36e392bb6c9951 /vos | |
| parent | 19fdefaada79479d11e3554520200be8f4de2a72 (diff) | |
Merge NetBSD changes from OO614B to HEAD.
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/inc/vos/object.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx index 4326bd58b72c..0d22d971c6b9 100644 --- a/vos/inc/vos/object.hxx +++ b/vos/inc/vos/object.hxx @@ -2,9 +2,9 @@ * * $RCSfile: object.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:18:12 $ + * last change: $Author: svesik $ $Date: 2001-02-16 00:55:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,7 +110,7 @@ public: /** Define private new and delete operator because of compiler bug, when allocating and deleteing a exported class */ -#if defined MACOS || defined MACOSX +#if defined MACOS || defined MACOSX || defined NETBSD void* SAL_CALL operator new(size_t size); void* SAL_CALL operator new(size_t size, void* p); #else |