diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-20 18:35:52 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-20 18:35:52 +0000 |
| commit | 9aecc3a5e5473d2aede6104cb4a23bcab0daba3e (patch) | |
| tree | ea98034c07ef38cc40184a6e3ec6ff2814dabf4e /sal/qa/osl | |
| parent | 0838820f8d6e5d78dad53e4aa97bc084686955f0 (diff) | |
INTEGRATION: CWS reportdesign01 (1.6.298); FILE MERGED
2007/10/04 09:03:57 lla 1.6.298.1: #i67655# only updates on some tests to build warning free
Diffstat (limited to 'sal/qa/osl')
| -rwxr-xr-x | sal/qa/osl/socket/osl_Socket_Const.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index 9835d155f74f..e9a19c17c8af 100755 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -4,9 +4,9 @@ * * $RCSfile: osl_Socket_Const.h,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:40:10 $ + * last change: $Author: ihi $ $Date: 2007-11-20 19:35:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -111,10 +111,13 @@ extern "C" # include <netdb.h> # include <netinet/in.h> # include <arpa/inet.h> -#else // Windows -# include <windows.h> +#endif +#if ( defined WNT ) // Windows +#include <tools/prewin.h> +// # include <windows.h> # include <winsock.h> # include <string.h> +#include <tools/postwin.h> #endif |