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

[Albert Astals Cid]

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

New commits:
commit e5b93a847ae4e20a77fecef0938da4f14dfbe3eb
Author: Hib Eris <hib at hiberis.nl>
Date:   Sun Dec 28 22:59:14 2008 +0100

    Let compiler figure out CDECL
    
    CDECL is a compiler specific macro to specify C calling convention.
    
    On Windows, some functions must be forced to use this calling convention.
    To do this, you can use the macro CDECL, which is defined in windef.h.
    
    Poppler should not try to be smarter than the compiler and try to guess
    the correct definition for CDECL. Instead it should rely on the
    definitions in the windef.h file provided by the compiler.
    
    On Unix, specifying a calling convention is not nescessary, so CDECL can
    be an empty definition.

diff --git a/poppler-config.h.cmake b/poppler-config.h.cmake
index bcff435..a02f8ce 100644
--- a/poppler-config.h.cmake
+++ b/poppler-config.h.cmake
@@ -69,12 +69,8 @@
 // Win32 stuff
 //------------------------------------------------------------------------
 
-#ifdef CDECL
-#undef CDECL
-#endif
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define CDECL __cdecl
+#ifdef WIN32
+#include <windef.h>
 #else
 #define CDECL
 #endif
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index c78d75f..32d0f63 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -69,12 +69,8 @@
 // Win32 stuff
 //------------------------------------------------------------------------
 
-#ifdef CDECL
-#undef CDECL
-#endif
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define CDECL __cdecl
+#ifdef WIN32
+#include <windef.h>
 #else
 #define CDECL
 #endif