diff options
| author | Sander Vesik <svesik@openoffice.org> | 2002-08-27 12:38:01 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2002-08-27 12:38:01 +0000 |
| commit | 18c6d1062bfe6cd288b5720ef6cda0cc807ec5c5 (patch) | |
| tree | a89c6918b31b7a3ffac75b625b9a9fe39c169f3d /bridges | |
| parent | a741b217589323519c3526a6d7eea01511183edd (diff) | |
Merge changes from OOO_STABLE_1 to HEAD
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/remote/static/proxy.cxx | 6 | ||||
| -rw-r--r-- | bridges/source/remote/static/stub.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bridges/source/remote/static/proxy.cxx b/bridges/source/remote/static/proxy.cxx index 5d0e89446a4c..ddca7b343d85 100644 --- a/bridges/source/remote/static/proxy.cxx +++ b/bridges/source/remote/static/proxy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: proxy.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2001-10-15 16:49:52 $ + * last change: $Author: svesik $ $Date: 2002-08-27 13:38:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,7 @@ * ************************************************************************/ #include <assert.h> -#ifdef SOLARIS +#if defined(SOLARIS) || defined(IRIX) #include <alloca.h> #elif defined MACOSX #include <sys/types.h> diff --git a/bridges/source/remote/static/stub.cxx b/bridges/source/remote/static/stub.cxx index 758e51e2046a..86b6d80a598d 100644 --- a/bridges/source/remote/static/stub.cxx +++ b/bridges/source/remote/static/stub.cxx @@ -2,9 +2,9 @@ * * $RCSfile: stub.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: pluby $ $Date: 2000-10-20 01:07:05 $ + * last change: $Author: svesik $ $Date: 2002-08-27 13:38:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,7 @@ * * ************************************************************************/ -#ifdef SOLARIS +#if defined(SOLARIS) || defined(IRIX) #include <alloca.h> #elif defined MACOSX #include <sys/types.h> |