Alexandre Julliard : wia: Force specifying the correct header version in Wine code.
Alexandre Julliard
julliard at winehq.org
Wed Nov 4 10:26:21 CST 2009
Module: wine
Branch: master
Commit: ab1f58864e11810e418b3f69be75481326558de2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1f58864e11810e418b3f69be75481326558de2
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Nov 4 12:27:01 2009 +0100
wia: Force specifying the correct header version in Wine code.
---
dlls/wiaservc/wiaservc_main.c | 2 +-
include/wia.h | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c
index 4f94275..2d30f9d 100644
--- a/dlls/wiaservc/wiaservc_main.c
+++ b/dlls/wiaservc/wiaservc_main.c
@@ -25,7 +25,7 @@
#include "olectl.h"
#include "winsvc.h"
-#include "wia.h"
+#include "wia_lh.h"
#include "initguid.h"
#include "wine/debug.h"
diff --git a/include/wia.h b/include/wia.h
index 300f28a..3a0497e 100644
--- a/include/wia.h
+++ b/include/wia.h
@@ -17,6 +17,10 @@
*/
+#ifdef __WINESRC__
+#error Specify wia_lh.h or wia_xp.h explicitly in Wine
+#endif
+
#if (_WIN32_WINNT >= 0x0600)
#include <wia_lh.h>
#elif (_WIN32_WINNT >= 0x0501)
More information about the wine-cvs
mailing list