diff options
| author | Martin Hollmichel <mh@openoffice.org> | 2001-08-15 02:35:15 +0000 |
|---|---|---|
| committer | Martin Hollmichel <mh@openoffice.org> | 2001-08-15 02:35:15 +0000 |
| commit | 9017e9766798f66861abf9fda56ed1b43d7df012 (patch) | |
| tree | 9da7946a86d95f40dc7636b9717523c62f57d205 /sal/inc | |
| parent | 01777a84aa9c6b265ad3376d7c1f4db4b894c6ca (diff) | |
add: support for gcc for windows added
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/sal/config.h | 6 | ||||
| -rw-r--r-- | sal/inc/sal/types.h | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index f362a1f753b4..666da2779075 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -2,9 +2,9 @@ * * $RCSfile: config.h,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hro $ $Date: 2001-06-26 16:58:22 $ + * last change: $Author: mh $ $Date: 2001-08-15 03:35:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,7 @@ extern "C" { #define SAL_CONFIGFILE( name ) name ".ini" #define SAL_SYSCONFIGFILE( name ) name ".ini" +#ifdef __MSC_VER /* No warning for: C++ Exception Specification ignored */ #pragma warning( disable : 4290 ) @@ -91,6 +92,7 @@ extern "C" { #endif #endif +#endif /* BR: 16bit fuer Borland-Compiler */ #ifdef __BORLANDC__ diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 1894f3a9a54f..890ac0f55a23 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -2,9 +2,9 @@ * * $RCSfile: types.h,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: dbo $ $Date: 2001-05-17 13:04:06 $ + * last change: $Author: mh $ $Date: 2001-08-15 03:35:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,7 @@ typedef unsigned long sal_Size; #define SAL_MAX_ENUM 0x7fff #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) || (defined(WNT) && defined(__GNUC__)) # define SAL_DLLEXPORT __declspec(dllexport) # define SAL_CALL __cdecl # define SAL_CALL_ELLIPSE __cdecl |