From 07b92b466d55bbb7097bbaa778d2e72290862933 Mon Sep 17 00:00:00 2001 From: PerryWerneck Date: Sat, 10 Dec 2016 20:35:05 -0200 Subject: [PATCH] Ajustes na API ooRexx --- src/include/pw3270/class.h | 6 ------ src/plugins/rx3270/pluginmain.cc | 4 +++- src/plugins/rx3270/rx3270.h | 2 ++ src/plugins/rx3270/rxapimain.cc | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/include/pw3270/class.h b/src/include/pw3270/class.h index 36f8bfd..32e4040 100644 --- a/src/include/pw3270/class.h +++ b/src/include/pw3270/class.h @@ -116,13 +116,7 @@ -#if defined (HAVE_GNUC_VISIBILITY) - class __attribute__((visibility("default"))) session -#elif defined(WIN32) - class __declspec (dllexport) session -#else class session -#endif { public: diff --git a/src/plugins/rx3270/pluginmain.cc b/src/plugins/rx3270/pluginmain.cc index 2ac7d37..7fc0a2c 100644 --- a/src/plugins/rx3270/pluginmain.cc +++ b/src/plugins/rx3270/pluginmain.cc @@ -406,7 +406,9 @@ extern "C" #if GTK_CHECK_VERSION(2,32,0) g_mutex_init(&mutex); #endif // GTK_CHECK_VERSION - session::set_plugin(factory); + + rx3270_set_factory_method(factory); + return 0; } diff --git a/src/plugins/rx3270/rx3270.h b/src/plugins/rx3270/rx3270.h index 07a3fb4..f30d7fe 100644 --- a/src/plugins/rx3270/rx3270.h +++ b/src/plugins/rx3270/rx3270.h @@ -41,6 +41,7 @@ #include #include #include + #include #ifndef ETIMEDOUT #define ETIMEDOUT -1 @@ -150,6 +151,7 @@ #endif LIB3270_EXPORT void rx3270_set_package_option(RexxOption *option); + LIB3270_EXPORT void rx3270_set_factory_method(PW3270_NAMESPACE::session * (*)(const char *)); #ifdef __cplusplus } diff --git a/src/plugins/rx3270/rxapimain.cc b/src/plugins/rx3270/rxapimain.cc index b1e7a86..e6207d4 100644 --- a/src/plugins/rx3270/rxapimain.cc +++ b/src/plugins/rx3270/rxapimain.cc @@ -49,6 +49,11 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ +void rx3270_set_factory_method(PW3270_NAMESPACE::session * (* factory)(const char *)) +{ + PW3270_NAMESPACE::session::set_plugin(factory); +} + // now build the actual entry list RexxRoutineEntry rx3270_functions[] = { -- libgit2 0.21.2