diff options
Diffstat (limited to 'modules/windows-sens/evolution-windows-sens.c')
| -rw-r--r-- | modules/windows-sens/evolution-windows-sens.c | 35 |
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> |