diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-03-03 16:35:40 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-03-03 16:35:40 +0000 |
commit | e0adfd46552cd1b3d36d5e370a4a58567d9c31cb (patch) | |
tree | 530141f2ac13eb061cb7e7fb7277e33020ec3431 /cppu/source/typelib/static_types.cxx | |
parent | 262ccac79f1ae91f260bdc9ccf252f236aa2e1c2 (diff) |
INTEGRATION: CWS solarisgcc02 (1.13.24); FILE MERGED
2005/02/15 20:46:46 pjanik 1.13.24.1: #i42549#: Use stdargs.h instead of varargs.h on Solaris with GCC.
Patch contributed by Taniguchi Yasuaki (JCA).
Diffstat (limited to 'cppu/source/typelib/static_types.cxx')
-rw-r--r-- | cppu/source/typelib/static_types.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index d9124b099669..20f2d8526af6 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -2,9 +2,9 @@ * * $RCSfile: static_types.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2004-07-23 14:40:07 $ + * last change: $Author: kz $ $Date: 2005-03-03 17:35:40 $ * * 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(__GNUC__) #include <varargs.h> #else #include <stdarg.h> |