Adapt to move of prewin.h and postwin.h
This commit is contained in:
parent
bc0cbfc119
commit
175f1c5a24
9 changed files with 18 additions and 18 deletions
|
@ -99,13 +99,13 @@ const sal_Char pBuffer_Blank[] = "";
|
||||||
# define PATH_SEPERATOR "/"
|
# define PATH_SEPERATOR "/"
|
||||||
#endif
|
#endif
|
||||||
#if (defined WNT ) // Windows
|
#if (defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
// # include <windows.h>
|
// # include <windows.h>
|
||||||
# include <tchar.h>
|
# include <tchar.h>
|
||||||
# include <io.h>
|
# include <io.h>
|
||||||
# include <stdio.h>
|
# include <stdio.h>
|
||||||
# include <stdlib.h>
|
# include <stdlib.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
# define PATH_MAX MAX_PATH
|
# define PATH_MAX MAX_PATH
|
||||||
# define TEST_PLATFORM "c:/"
|
# define TEST_PLATFORM "c:/"
|
||||||
# define TEST_PLATFORM_ROOT "c:/"
|
# define TEST_PLATFORM_ROOT "c:/"
|
||||||
|
|
|
@ -43,10 +43,10 @@
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
// # include <windows.h>
|
// # include <windows.h>
|
||||||
# include <io.h>
|
# include <io.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# define FILE_PREFIX "file:///"
|
# define FILE_PREFIX "file:///"
|
||||||
|
|
|
@ -43,11 +43,11 @@
|
||||||
#include <sal/macros.h>
|
#include <sal/macros.h>
|
||||||
|
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
# define WIN32_LEAN_AND_MEAN
|
# define WIN32_LEAN_AND_MEAN
|
||||||
// # include <windows.h>
|
// # include <windows.h>
|
||||||
# include <tchar.h>
|
# include <tchar.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "rtl/allocator.hxx"
|
#include "rtl/allocator.hxx"
|
||||||
|
|
|
@ -33,13 +33,13 @@
|
||||||
// includes
|
// includes
|
||||||
|
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
# define UNICODE
|
# define UNICODE
|
||||||
# define _UNICODE
|
# define _UNICODE
|
||||||
# define WIN32_LEAN_AND_MEAN
|
# define WIN32_LEAN_AND_MEAN
|
||||||
// # include <windows.h>
|
// # include <windows.h>
|
||||||
# include <tchar.h>
|
# include <tchar.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#else
|
#else
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -30,9 +30,9 @@
|
||||||
#define _OSL_SECURITY_CONST_H_
|
#define _OSL_SECURITY_CONST_H_
|
||||||
|
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sal/types.h>
|
#include <sal/types.h>
|
||||||
|
|
|
@ -81,11 +81,11 @@ extern "C"
|
||||||
# include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
// # include <windows.h>
|
// # include <windows.h>
|
||||||
# include <winsock.h>
|
# include <winsock.h>
|
||||||
# include <string.h>
|
# include <string.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -81,11 +81,11 @@ extern "C"
|
||||||
# include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
// # include <windows.h>
|
// # include <windows.h>
|
||||||
# include <winsock.h>
|
# include <winsock.h>
|
||||||
# include <string.h>
|
# include <string.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -74,10 +74,10 @@ extern "C"
|
||||||
#ifndef _OSL_SOCKET_CONST_H_
|
#ifndef _OSL_SOCKET_CONST_H_
|
||||||
|
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
#include <winsock.h>
|
#include <winsock.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -46,9 +46,9 @@
|
||||||
|
|
||||||
#include <osl/file.hxx>
|
#include <osl/file.hxx>
|
||||||
#if ( defined WNT ) // Windows
|
#if ( defined WNT ) // Windows
|
||||||
#include <tools/prewin.h>
|
#include <prewin.h>
|
||||||
#include <tchar.h>
|
#include <tchar.h>
|
||||||
#include <tools/postwin.h>
|
#include <postwin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
using namespace ::osl;
|
using namespace ::osl;
|
||||||
|
|
Loading…
Reference in a new issue