Fix Windows build.

FirebirdSQL · Dec 24, 2021 · d6757d0 · d6757d0
1 parent 12050e9
commit d6757d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/common/common.h b/src/common/common.h
@@ -252,7 +252,6 @@
 
 #define API_ROUTINE __attribute__((visibility("default")))
 #define API_ROUTINE_VARARG API_ROUTINE
-#define INTERNAL_API_ROUTINE API_ROUTINE
 
 #define O_DIRECT F_NOCACHE
 #endif /* Darwin Platforms */

diff --git a/src/yvalve/gds.cpp b/src/yvalve/gds.cpp
@@ -3977,13 +3977,13 @@ static void sanitize(Firebird::string& locale)
 }
 
 
-void FB_DLL_EXPORT gds__default_printer(void* /*arg*/, SSHORT offset, const TEXT* line)
+void API_ROUTINE_VARARG gds__default_printer(void* /*arg*/, SSHORT offset, const TEXT* line)
 {
 	printf("%4d %s\n", offset, line);
 }
 
 
-void FB_DLL_EXPORT gds__trace_printer(void* /*arg*/, SSHORT offset, const TEXT* line)
+void API_ROUTINE_VARARG gds__trace_printer(void* /*arg*/, SSHORT offset, const TEXT* line)
 {
 	// Assume that line is not too long
 	char buffer[PRETTY_BUFFER_SIZE + 10];

diff --git a/src/yvalve/gds_proto.h b/src/yvalve/gds_proto.h
@@ -134,8 +134,10 @@ SINT64	API_ROUTINE isc_portable_integer(const UCHAR*, SSHORT);
 void	gds__cleanup();
 void	gds__ulstr(char* buffer, FB_UINT64 value, const int minlen, const char filler);
 
-void	gds__default_printer(void*, SSHORT, const TEXT*);
-void	gds__trace_printer(void*, SSHORT, const TEXT*);
+// These functions uses cdecl convention in Windows, so use API_ROUTINE_VARARG instead of API_ROUTINE (stdcall).
+void	API_ROUTINE_VARARG gds__default_printer(void*, SSHORT, const TEXT*);
+void	API_ROUTINE_VARARG gds__trace_printer(void*, SSHORT, const TEXT*);
+
 #ifdef NOT_USED_OR_REPLACED
 void	gds__print_pool(Firebird::MemoryPool*, const TEXT*, ...);
 #endif