From 03dfb39bd0b0fa8e958f0fed00cdf44133d936d1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 19 Apr 2007 11:32:43 -0400 Subject: [PATCH] ENH: Added function call argument to module function to make sure calling convention matches on lookup. Fixed for Watcom. --- Tests/Plugin/src/example_exe.cxx | 8 ++++++-- Tests/Plugin/src/example_mod_1.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx index 96566d5f6..df7b2a07b 100644 --- a/Tests/Plugin/src/example_exe.cxx +++ b/Tests/Plugin/src/example_exe.cxx @@ -44,8 +44,12 @@ int main() << kwsys_ios::endl; return 1; } - int(*f)() = reinterpret_cast(sym); - if(f() != (123+456)) +#ifdef __WATCOMC__ + int(__cdecl *f)(int) = (int(__cdecl *)(int))(sym); +#else + int(*f)(int) = reinterpret_cast(sym); +#endif + if(f(456) != (123+456)) { kwsys_ios::cerr << "Incorrect return value from plugin!" << kwsys_ios::endl; diff --git a/Tests/Plugin/src/example_mod_1.c b/Tests/Plugin/src/example_mod_1.c index f96ba2955..1fc733845 100644 --- a/Tests/Plugin/src/example_mod_1.c +++ b/Tests/Plugin/src/example_mod_1.c @@ -8,9 +8,15 @@ # define MODULE_EXPORT #endif -MODULE_EXPORT int example_mod_1_function() +#ifdef __WATCOMC__ +# define MODULE_CCONV __cdecl +#else +# define MODULE_CCONV +#endif + +MODULE_EXPORT int MODULE_CCONV example_mod_1_function(int n) { - int result = example_exe_function() + 456; + int result = example_exe_function() + n; printf("world\n"); return result; }