Commit 07b92b466d55bbb7097bbaa778d2e72290862933
1 parent
b3a6ad33
Exists in
master
and in
5 other branches
Ajustes na API ooRexx
Showing
4 changed files
with
10 additions
and
7 deletions
Show diff stats
src/include/pw3270/class.h
| @@ -116,13 +116,7 @@ | @@ -116,13 +116,7 @@ | ||
| 116 | 116 | ||
| 117 | 117 | ||
| 118 | 118 | ||
| 119 | -#if defined (HAVE_GNUC_VISIBILITY) | ||
| 120 | - class __attribute__((visibility("default"))) session | ||
| 121 | -#elif defined(WIN32) | ||
| 122 | - class __declspec (dllexport) session | ||
| 123 | -#else | ||
| 124 | class session | 119 | class session |
| 125 | -#endif | ||
| 126 | { | 120 | { |
| 127 | public: | 121 | public: |
| 128 | 122 |
src/plugins/rx3270/pluginmain.cc
| @@ -406,7 +406,9 @@ extern "C" | @@ -406,7 +406,9 @@ extern "C" | ||
| 406 | #if GTK_CHECK_VERSION(2,32,0) | 406 | #if GTK_CHECK_VERSION(2,32,0) |
| 407 | g_mutex_init(&mutex); | 407 | g_mutex_init(&mutex); |
| 408 | #endif // GTK_CHECK_VERSION | 408 | #endif // GTK_CHECK_VERSION |
| 409 | - session::set_plugin(factory); | 409 | + |
| 410 | + rx3270_set_factory_method(factory); | ||
| 411 | + | ||
| 410 | return 0; | 412 | return 0; |
| 411 | } | 413 | } |
| 412 | 414 |
src/plugins/rx3270/rx3270.h
| @@ -41,6 +41,7 @@ | @@ -41,6 +41,7 @@ | ||
| 41 | #include <lib3270/popup.h> | 41 | #include <lib3270/popup.h> |
| 42 | #include <stdarg.h> | 42 | #include <stdarg.h> |
| 43 | #include <gtk/gtk.h> | 43 | #include <gtk/gtk.h> |
| 44 | + #include <pw3270/class.h> | ||
| 44 | 45 | ||
| 45 | #ifndef ETIMEDOUT | 46 | #ifndef ETIMEDOUT |
| 46 | #define ETIMEDOUT -1 | 47 | #define ETIMEDOUT -1 |
| @@ -150,6 +151,7 @@ | @@ -150,6 +151,7 @@ | ||
| 150 | #endif | 151 | #endif |
| 151 | 152 | ||
| 152 | LIB3270_EXPORT void rx3270_set_package_option(RexxOption *option); | 153 | LIB3270_EXPORT void rx3270_set_package_option(RexxOption *option); |
| 154 | + LIB3270_EXPORT void rx3270_set_factory_method(PW3270_NAMESPACE::session * (*)(const char *)); | ||
| 153 | 155 | ||
| 154 | #ifdef __cplusplus | 156 | #ifdef __cplusplus |
| 155 | } | 157 | } |
src/plugins/rx3270/rxapimain.cc
| @@ -49,6 +49,11 @@ | @@ -49,6 +49,11 @@ | ||
| 49 | 49 | ||
| 50 | /*--[ Implement ]------------------------------------------------------------------------------------*/ | 50 | /*--[ Implement ]------------------------------------------------------------------------------------*/ |
| 51 | 51 | ||
| 52 | +void rx3270_set_factory_method(PW3270_NAMESPACE::session * (* factory)(const char *)) | ||
| 53 | +{ | ||
| 54 | + PW3270_NAMESPACE::session::set_plugin(factory); | ||
| 55 | +} | ||
| 56 | + | ||
| 52 | // now build the actual entry list | 57 | // now build the actual entry list |
| 53 | RexxRoutineEntry rx3270_functions[] = | 58 | RexxRoutineEntry rx3270_functions[] = |
| 54 | { | 59 | { |