summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-07 17:20:32 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-07 17:20:32 +0200
commit1b613450f85d052b7343eacefd79abbfe4f35e2f (patch)
tree5bbce6b1abc6a1865801b1f50979f3b2305fdd5e /include/svl
parent6e98009240b492fda7cfbbdf0e8a01773eeffe64 (diff)
More blind fix for --enable-pch Windows builds
Change-Id: I8e7c79a4d3a9d6c226f9d112c59ada5a7f76c7a4
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/svdde.hxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 0e8b96074230..3ea9f68906f0 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -28,13 +28,6 @@
#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;
@@ -56,6 +49,13 @@ 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( HCONV );
- void DecMonitor( HCONV );
+ void IncMonitor( svl_dde::HCONV );
+ void DecMonitor( svl_dde::HCONV );
#endif
protected:
@@ -249,7 +249,7 @@ public:
class SVL_DLLPUBLIC DdeTopic
{
#if defined _WIN32
- SVL_DLLPRIVATE void Disconnect( HCONV );
+ SVL_DLLPRIVATE void Disconnect( svl_dde::HCONV );
#endif
public: