[poppler] poppler-config.h.cmake poppler/poppler-config.h.in

[Pino Toscano]

 poppler-config.h.cmake      |    2 +-
 poppler/poppler-config.h.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0974b7b4bfe3f8cf3a1408741ddf01c667c28044
Author: Patrick Spendrin <ps_ml at gmx.de>
Date:   Thu May 14 16:15:22 2009 +0200

    [Win32] Build fix for MSVC.

diff --git a/poppler-config.h.cmake b/poppler-config.h.cmake
index 3c36e32..9ffe64e 100644
--- a/poppler-config.h.cmake
+++ b/poppler-config.h.cmake
@@ -69,7 +69,7 @@
 // Win32 stuff
 //------------------------------------------------------------------------
 
-#ifdef WIN32
+#if defined(_WIN32) && !defined(_MSC_VER)
 #include <windef.h>
 #else
 #define CDECL
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 7abe873..6a8ec60 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -69,7 +69,7 @@
 // Win32 stuff
 //------------------------------------------------------------------------
 
-#ifdef WIN32
+#if defined(_WIN32) && !defined(_MSC_VER)
 #include <windef.h>
 #else
 #define CDECL