Skip to content

fix: prefix exported Iris symbols to avoid collisions #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LichKing-2234 merged 1 commit into from
Jul 24, 2025
Merged

fix: prefix exported Iris symbols to avoid collisions #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ios/iris_method_channel/Sources/iris_method_channel/IrisMethodChannelPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
/// dummy function to avoid symbols striping when building static library.
+ (void)_irisMethodChannelDummyFunc {
EventParam p;
InitDartApiDL(NULL);
Dispose();
OnEvent(NULL);
RegisterDartPort(0);
UnregisterDartPort(0);
Iris_InitDartApiDL(NULL);
Iris_Dispose();
Iris_OnEvent(NULL);
Iris_RegisterDartPort(0);
Iris_UnregisterDartPort(0);
}

@end
10 changes: 5 additions & 5 deletions lib/src/platform/io/bindings/native_iris_event_bindings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class NativeIrisEventBinding {

late final _InitDartApiDLPtr =
_lookup<ffi.NativeFunction<ffi.IntPtr Function(ffi.Pointer<ffi.Void>)>>(
'InitDartApiDL');
'Iris_InitDartApiDL');
late final _InitDartApiDL =
_InitDartApiDLPtr.asFunction<int Function(ffi.Pointer<ffi.Void>)>();

Expand All @@ -40,7 +40,7 @@ class NativeIrisEventBinding {
}

late final _DisposePtr =
_lookup<ffi.NativeFunction<ffi.Void Function()>>('Dispose');
_lookup<ffi.NativeFunction<ffi.Void Function()>>('Iris_Dispose');
late final _Dispose = _DisposePtr.asFunction<void Function()>();

void OnEvent(
Expand All @@ -53,7 +53,7 @@ class NativeIrisEventBinding {

late final _OnEventPtr =
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<EventParam>)>>(
'OnEvent');
'Iris_OnEvent');
late final _OnEvent =
_OnEventPtr.asFunction<void Function(ffi.Pointer<EventParam>)>();

Expand Down Expand Up @@ -131,7 +131,7 @@ class NativeIrisEventBinding {

late final _RegisterDartPortPtr =
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int64)>>(
'RegisterDartPort');
'Iris_RegisterDartPort');
late final _RegisterDartPort =
_RegisterDartPortPtr.asFunction<void Function(int)>();

Expand All @@ -145,7 +145,7 @@ class NativeIrisEventBinding {

late final _UnregisterDartPortPtr =
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int64)>>(
'UnregisterDartPort');
'Iris_UnregisterDartPort');
late final _UnregisterDartPort =
_UnregisterDartPortPtr.asFunction<void Function(int)>();

Expand Down
10 changes: 5 additions & 5 deletions src/iris_event.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ std::unique_ptr<DartMessageHandlerManager> dartMessageHandlerManager_ = nullptr;
int init_dart_api_times_ = 0;

// Initialize `dart_api_dl.h`
EXPORT intptr_t InitDartApiDL(void *data)
EXPORT intptr_t Iris_InitDartApiDL(void *data)
{
std::lock_guard<std::mutex> lock(message_handler_mutex_);
int ret = 0;
Expand All @@ -217,7 +217,7 @@ EXPORT intptr_t InitDartApiDL(void *data)
return ret;
}

EXPORT void Dispose()
EXPORT void Iris_Dispose()
{
std::lock_guard<std::mutex> lock(message_handler_mutex_);
--init_dart_api_times_;
Expand All @@ -227,7 +227,7 @@ EXPORT void Dispose()
}
}

EXPORT void OnEvent(EventParam *param)
EXPORT void Iris_OnEvent(EventParam *param)
{
std::lock_guard<std::mutex> lock(message_handler_mutex_);
if (dartMessageHandlerManager_)
Expand All @@ -236,7 +236,7 @@ EXPORT void OnEvent(EventParam *param)
}
}

EXPORT void RegisterDartPort(Dart_Port send_port)
EXPORT void Iris_RegisterDartPort(Dart_Port send_port)
{
std::lock_guard<std::mutex> lock(message_handler_mutex_);
if (dartMessageHandlerManager_)
Expand All @@ -245,7 +245,7 @@ EXPORT void RegisterDartPort(Dart_Port send_port)
}
}

EXPORT void UnregisterDartPort(Dart_Port send_port)
EXPORT void Iris_UnregisterDartPort(Dart_Port send_port)
{
std::lock_guard<std::mutex> lock(message_handler_mutex_);
if (dartMessageHandlerManager_)
Expand Down
10 changes: 5 additions & 5 deletions src/iris_event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ extern "C"
} EventParam;

// Initialize `dart_api_dl.h`
EXPORT intptr_t InitDartApiDL(void *data);
EXPORT intptr_t Iris_InitDartApiDL(void *data);

EXPORT void Dispose();
EXPORT void Iris_Dispose();

EXPORT void OnEvent(EventParam *param);
EXPORT void Iris_OnEvent(EventParam *param);

EXPORT void RegisterDartPort(Dart_Port send_port);
EXPORT void Iris_RegisterDartPort(Dart_Port send_port);

EXPORT void UnregisterDartPort(Dart_Port send_port);
EXPORT void Iris_UnregisterDartPort(Dart_Port send_port);

#ifdef __cplusplus
}
Expand Down
Loading