aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2010-04-01 00:19:44 +0800
committerFridrich Štrba <fridrich.strba@bluewin.ch>2010-04-01 00:21:10 +0800
commit4f848ac25536eb1f3475b58e36faf42d0555192d (patch)
tree5503ebbdca7d3f58cf800ca13d2b3351ef957003 /modules
parent5fca82f0b00fbecf8e7045ea5ba99016e03605fb (diff)
downloadgsoc2013-evolution-4f848ac25536eb1f3475b58e36faf42d0555192d.tar
gsoc2013-evolution-4f848ac25536eb1f3475b58e36faf42d0555192d.tar.gz
gsoc2013-evolution-4f848ac25536eb1f3475b58e36faf42d0555192d.tar.bz2
gsoc2013-evolution-4f848ac25536eb1f3475b58e36faf42d0555192d.tar.lz
gsoc2013-evolution-4f848ac25536eb1f3475b58e36faf42d0555192d.tar.xz
gsoc2013-evolution-4f848ac25536eb1f3475b58e36faf42d0555192d.tar.zst
gsoc2013-evolution-4f848ac25536eb1f3475b58e36faf42d0555192d.zip
[win32] Test for eventsys.h and sensevts.h properly
Diffstat (limited to 'modules')
-rw-r--r--modules/windows-sens/evolution-windows-sens.c35
1 files changed, 22 insertions, 13 deletions
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index 580bb1d9bd..d228fc02ac 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -20,26 +20,20 @@
#error This file cannot be built with C++ compiler
#endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#define INITGUID
#include <windows.h>
#include <rpc.h>
-#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
-
+#ifdef HAVE_EVENTSYS_H
#include <eventsys.h>
-#include <sensevts.h>
-
#else
/* Extract relevant typedefs from mingw-w64 headers */
-typedef struct {
- DWORD dwSize;
- DWORD dwFlags;
- DWORD dwOutSpeed;
- DWORD dwInSpeed;
-} *LPSENS_QOCINFO;
-
typedef struct IEnumEventObject IEnumEventObject;
const IID IID_IEnumEventObject;
@@ -159,6 +153,23 @@ struct IEventSubscription {
CONST_VTBL struct IEventSubscriptionVtbl *lpVtbl;
};
+#define PROGID_EventSubscription OLESTR("EventSystem.EventSubscription")
+
+#endif
+
+#ifdef HAVE_SENSEVTS_H
+#include <sensevts.h>
+#else
+
+/* Extract relevant typedefs from mingw-w64 headers */
+
+typedef struct {
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwOutSpeed;
+ DWORD dwInSpeed;
+} *LPSENS_QOCINFO;
+
typedef struct ISensNetwork ISensNetwork;
const IID IID_ISensNetwork;
@@ -182,8 +193,6 @@ struct ISensNetwork {
CONST_VTBL struct ISensNetworkVtbl *lpVtbl;
};
-#define PROGID_EventSubscription OLESTR("EventSystem.EventSubscription")
-
#endif
#include <shell/e-shell.h>