Francois Gouget : imm32: #ifdef-out some functions in imm.h if wingdi. h was not included first.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cb7decd6f641a7d13ef7749adab562f665d89e91
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cb7decd6f641a7d13ef7749adab562f665d89e91

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Oct 18 17:12:30 2007 +0200

imm32: #ifdef-out some functions in imm.h if wingdi.h was not included first.

---

 include/imm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/imm.h b/include/imm.h
index 89473ed..85848e6 100644
--- a/include/imm.h
+++ b/include/imm.h
@@ -493,7 +493,7 @@ DWORD    WINAPI ImmGetCandidateListCountA(HIMC, LPDWORD);
 DWORD    WINAPI ImmGetCandidateListCountW(HIMC, LPDWORD);
 #define  ImmGetCandidateListCount WINELIB_NAME_AW(ImmGetCandidateListCount)
 BOOL   WINAPI ImmGetCandidateWindow(HIMC, DWORD, LPCANDIDATEFORM);
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 BOOL   WINAPI ImmGetCompositionFontA(HIMC, LPLOGFONTA);
 BOOL   WINAPI ImmGetCompositionFontW(HIMC, LPLOGFONTW);
 #define  ImmGetCompositionFont WINELIB_NAME_AW(ImmGetCompositionFont)