diff options
Diffstat (limited to 'extensions/test/ole/OleClient/clientTest.cxx')
-rw-r--r-- | extensions/test/ole/OleClient/clientTest.cxx | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 03d1c1c4ef66..2c53e29b52a5 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -2,9 +2,9 @@ * * $RCSfile: clientTest.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jl $ $Date: 2000-10-16 12:48:37 $ + * last change: $Author: jl $ $Date: 2001-06-27 10:59:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,14 +59,6 @@ * ************************************************************************/ -#include <windows.h> -#include <comdef.h> -#include <tchar.h> -#include <atlbase.h> -extern CComModule _Module; -#include<atlcom.h> -#include<atlimpl.cpp> - #include <com/sun/star/bridge/ModelDependent.hpp> #include <com/sun/star/bridge/XBridgeSupplier2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -78,6 +70,29 @@ extern CComModule _Module; #include <rtl/string.h> #pragma hdrstop + +//#include <windows.h> +#include <comdef.h> +//#include <tchar.h> +#include <windef.h> +#include <atlbase.h> + +// actually defined in windef.h but after altbase.h it is undefined +// it is used in atlcom.h +#ifndef max +#define max(a,b) (((a) > (b)) ? (a) : (b)) +#endif + +#ifndef min +#define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +extern CComModule _Module; + + +#include<atlcom.h> +#include<atlimpl.cpp> + #include "axhost.hxx" CComModule _Module; |