summaryrefslogtreecommitdiff
path: root/dtrans/source/win32
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-08 12:39:17 +0100
committerDavid Tardon <dtardon@redhat.com>2012-03-12 08:53:38 +0100
commitc169483c49f78ce72d751610bb3b04103f8132c5 (patch)
tree6f9bf841a4156da2ed310550463d4b4d9727934b /dtrans/source/win32
parent49884860e60d807cf0d8649a19e98c8bf05b197e (diff)
WaE: "__uuidof" redefined
It would probably be better to find out why the "stock" __uuidof from MinGW causes linking error for libdnd (missing symbols) and if it can be fixed , but I am too lazy .-)
Diffstat (limited to 'dtrans/source/win32')
-rw-r--r--dtrans/source/win32/clipb/MtaOleClipb.cxx3
-rw-r--r--dtrans/source/win32/dnd/idroptarget.cxx3
-rw-r--r--dtrans/source/win32/dnd/source.cxx3
-rw-r--r--dtrans/source/win32/dtobj/APNDataObject.cxx3
-rw-r--r--dtrans/source/win32/dtobj/XNotifyingDataObject.cxx3
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx3
6 files changed, 18 insertions, 0 deletions
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 96f9647f9617..ca09a861a70d 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -55,6 +55,9 @@
#include <systools/win32/comtools.hxx>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx
index 9d8a60fc0e3d..f6b1ca77730e 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/dtrans/source/win32/dnd/idroptarget.cxx
@@ -30,6 +30,9 @@
#include <rtl/unload.h>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 5a1c63698c72..91860d7a8f63 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -45,6 +45,9 @@
#include <stdio.h>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 48f39eecced1..eb7761cc0ddc 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -34,6 +34,9 @@
#include <systools/win32/comtools.hxx>
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index 6809f65a1a53..2a8432df5578 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
@@ -33,6 +33,9 @@
#include "../../inc/DtObjFactory.hxx"
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index a5888b739843..31028ac97b3f 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -50,6 +50,9 @@
#endif
#ifdef __MINGW32__
+#if defined __uuidof
+#undef __uuidof
+#endif
#define __uuidof(I) IID_##I
#endif