Match declaration of setErrorFunction with its definition.

Also enable this code for Windows, since CDECL was what
was throwing msvc off.

1 files changed, 3 insertions, 9 deletions

diff --git a/poppler/Error.cc b/poppler/Error.cc
index fe1413b3..80e45aa6 100644
--- a/poppler/Error.cc
+++ b/poppler/Error.cc
@@ -18,7 +18,7 @@
 #include "GlobalParams.h"
 #include "Error.h"
 
-static void CDECL defaultErrorFunction(int pos, char *msg, va_list args)
+static void defaultErrorFunction(int pos, char *msg, va_list args)
 {
   if (pos >= 0) {
     fprintf(stderr, "Error (%d): ", pos);
@@ -30,14 +30,12 @@ static void CDECL defaultErrorFunction(int pos, char *msg, va_list args)
   fflush(stderr);
 }
 
-#ifndef _MSC_VER
-static void CDECL (*errorFunction)(int , char *, va_list args) = defaultErrorFunction;
+static void (*errorFunction)(int, char *, va_list args) = defaultErrorFunction;
 
-void setErrorFunction(void CDECL (* f)(int , char *, va_list args))
+void setErrorFunction(void (* f)(int, char *, va_list args))
 {
     errorFunction = f;
 }
-#endif
 
 void CDECL error(int pos, char *msg, ...) {
   va_list args;
@@ -46,11 +44,7 @@ void CDECL error(int pos, char *msg, ...) {
     return;
   }
   va_start(args, msg);
-#ifdef _MSC_VER
-  defaultErrorFunction(pos, msg, args);
-#else
   (*errorFunction)(pos, msg, args);
-#endif
   va_end(args);
 }