diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-10-07 17:47:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-07 17:47:35 +0200 |
| commit | ce650fc1cd83ff94183b783c95b9f20aaa14f942 (patch) | |
| tree | 05b8e5a33c430e8293c0061906bcd00c5161bcff /include/svl | |
| parent | 1b613450f85d052b7343eacefd79abbfe4f35e2f (diff) | |
Revert "More blind fix for --enable-pch Windows builds"
This reverts commit 1b613450f85d052b7343eacefd79abbfe4f35e2f.
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/svdde.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 3ea9f68906f0..0e8b96074230 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -28,6 +28,13 @@ #include <tools/link.hxx> #include <vector> +#if defined _WIN32 +#include <prewin.h> +#include <windows.h> +#include <postwin.h> +#include <ddeml.h> +#endif + class DdeString; class DdeData; class DdeConnection; @@ -49,13 +56,6 @@ typedef ::std::vector< DdeService* > DdeServices; typedef ::std::vector< long > DdeFormats; typedef ::std::vector< Conversation* > ConvList; -#if defined _WIN32 -namespace svl_dde { - -using HCONV = void *; // avoid including windows.h/ddeml.h - -} -#endif class SVL_DLLPUBLIC DdeData { @@ -214,8 +214,8 @@ class SVL_DLLPUBLIC DdeItem DdeItemImp* pImpData; #if defined _WIN32 - void IncMonitor( svl_dde::HCONV ); - void DecMonitor( svl_dde::HCONV ); + void IncMonitor( HCONV ); + void DecMonitor( HCONV ); #endif protected: @@ -249,7 +249,7 @@ public: class SVL_DLLPUBLIC DdeTopic { #if defined _WIN32 - SVL_DLLPRIVATE void Disconnect( svl_dde::HCONV ); + SVL_DLLPRIVATE void Disconnect( HCONV ); #endif public: |