diff options
| author | Sander Vesik <svesik@openoffice.org> | 2001-05-14 12:38:56 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2001-05-14 12:38:56 +0000 |
| commit | 59946bc978cbc3880efc8cfe817de5f3bbd9a5ae (patch) | |
| tree | ebb1a5f21e8bf30fe8c3c4093debb43e49b8b68f | |
| parent | 0d6a98d89d9a8d281b55f991068ed3cfb6d81f16 (diff) | |
Merge NetBSD changes from OO619B to trunk
| -rw-r--r-- | vcl/unx/source/window/salframe.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 303e11eb6d29..cf4306ba012b 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: bm $ $Date: 2001-05-09 13:14:46 $ + * last change: $Author: svesik $ $Date: 2001-05-14 13:38:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#ifndef FREEBSD +#if !(defined FREEBSD || defined NETBSD) #include <alloca.h> #endif |