Fixed cdecl problem

2 files changed, 6 insertions, 1 deletions

diff --git a/src/SFileListFile.cpp b/src/SFileListFile.cpp
index 587aba4..aa8969c 100644
--- a/src/SFileListFile.cpp
+++ b/src/SFileListFile.cpp
@@ -292,7 +292,7 @@ static char * ReadListFileLine(TListFileCache * pCache, size_t * PtrLength)
     return (char *)pbLineBegin;

 }

 

-static int __cdecl CompareFileNodes(const void * p1, const void * p2) 

+static int STORMLIB_CDECL CompareFileNodes(const void * p1, const void * p2) 

 {

     char * szFileName1 = *(char **)p1;

     char * szFileName2 = *(char **)p2;

diff --git a/src/StormPort.h b/src/StormPort.h
index 349dd20..c2bcf91 100644
--- a/src/StormPort.h
+++ b/src/StormPort.h
@@ -62,6 +62,8 @@
     #define PLATFORM_32BIT
   #endif
 
+  #define STORMLIB_CDECL __cdecl
+
   #define PLATFORM_WINDOWS
   #define PLATFORM_DEFINED                  // The platform is known now
 
@@ -161,6 +163,9 @@
     #define PLATFORM_32BIT
   #endif
 
+  // __cdecl meand nothing on non-Windows
+  #define STORMLIB_CDECL /* */
+
   // Typedefs for ANSI C
   typedef unsigned char  BYTE;
   typedef unsigned short USHORT;