diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-20 18:36:32 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-20 18:36:32 +0000 |
| commit | caa2a7538892de997c69bfab11e539ef7997d8e9 (patch) | |
| tree | 1b1ab684066593de18314f25079084ad2149cbb6 /sal/qa/osl | |
| parent | 022e16cb5062bb40b69b6163d8b6dd4df39d1ef6 (diff) | |
INTEGRATION: CWS reportdesign01 (1.4.298); FILE MERGED
2007/10/04 09:03:57 lla 1.4.298.1: #i67655# only updates on some tests to build warning free
Diffstat (limited to 'sal/qa/osl')
| -rw-r--r-- | sal/qa/osl/socket/sockethelper.hxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index 48fdd3a22a1c..11885ea97503 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sockethelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:41:28 $ + * last change: $Author: ihi $ $Date: 2007-11-20 19:36:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -105,12 +105,17 @@ extern "C" #include <netinet/in.h> #include <arpa/inet.h> #include <sys/wait.h> +#endif -#else // Windows +#ifndef _OSL_SOCKET_CONST_H_ -#include <windows.h> +#if ( defined WNT ) // Windows +#include <tools/prewin.h> +// #include <windows.h> #include <winsock.h> #include <string.h> +#include <tools/postwin.h> +#endif #endif |