Skip to content

Commit 292ce32

Browse files
authored
fix: prefix exported Iris symbols to avoid collisions (#122)
1 parent f89d394 commit 292ce32

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

ios/iris_method_channel/Sources/iris_method_channel/IrisMethodChannelPlugin.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
2121
/// dummy function to avoid symbols striping when building static library.
2222
+ (void)_irisMethodChannelDummyFunc {
2323
EventParam p;
24-
InitDartApiDL(NULL);
25-
Dispose();
26-
OnEvent(NULL);
27-
RegisterDartPort(0);
28-
UnregisterDartPort(0);
24+
Iris_InitDartApiDL(NULL);
25+
Iris_Dispose();
26+
Iris_OnEvent(NULL);
27+
Iris_RegisterDartPort(0);
28+
Iris_UnregisterDartPort(0);
2929
}
3030

3131
@end

lib/src/platform/io/bindings/native_iris_event_bindings.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class NativeIrisEventBinding {
3131

3232
late final _InitDartApiDLPtr =
3333
_lookup<ffi.NativeFunction<ffi.IntPtr Function(ffi.Pointer<ffi.Void>)>>(
34-
'InitDartApiDL');
34+
'Iris_InitDartApiDL');
3535
late final _InitDartApiDL =
3636
_InitDartApiDLPtr.asFunction<int Function(ffi.Pointer<ffi.Void>)>();
3737

@@ -40,7 +40,7 @@ class NativeIrisEventBinding {
4040
}
4141

4242
late final _DisposePtr =
43-
_lookup<ffi.NativeFunction<ffi.Void Function()>>('Dispose');
43+
_lookup<ffi.NativeFunction<ffi.Void Function()>>('Iris_Dispose');
4444
late final _Dispose = _DisposePtr.asFunction<void Function()>();
4545

4646
void OnEvent(
@@ -53,7 +53,7 @@ class NativeIrisEventBinding {
5353

5454
late final _OnEventPtr =
5555
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<EventParam>)>>(
56-
'OnEvent');
56+
'Iris_OnEvent');
5757
late final _OnEvent =
5858
_OnEventPtr.asFunction<void Function(ffi.Pointer<EventParam>)>();
5959

@@ -131,7 +131,7 @@ class NativeIrisEventBinding {
131131

132132
late final _RegisterDartPortPtr =
133133
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int64)>>(
134-
'RegisterDartPort');
134+
'Iris_RegisterDartPort');
135135
late final _RegisterDartPort =
136136
_RegisterDartPortPtr.asFunction<void Function(int)>();
137137

@@ -145,7 +145,7 @@ class NativeIrisEventBinding {
145145

146146
late final _UnregisterDartPortPtr =
147147
_lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int64)>>(
148-
'UnregisterDartPort');
148+
'Iris_UnregisterDartPort');
149149
late final _UnregisterDartPort =
150150
_UnregisterDartPortPtr.asFunction<void Function(int)>();
151151

src/iris_event.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ std::unique_ptr<DartMessageHandlerManager> dartMessageHandlerManager_ = nullptr;
202202
int init_dart_api_times_ = 0;
203203

204204
// Initialize `dart_api_dl.h`
205-
EXPORT intptr_t InitDartApiDL(void *data)
205+
EXPORT intptr_t Iris_InitDartApiDL(void *data)
206206
{
207207
std::lock_guard<std::mutex> lock(message_handler_mutex_);
208208
int ret = 0;
@@ -217,7 +217,7 @@ EXPORT intptr_t InitDartApiDL(void *data)
217217
return ret;
218218
}
219219

220-
EXPORT void Dispose()
220+
EXPORT void Iris_Dispose()
221221
{
222222
std::lock_guard<std::mutex> lock(message_handler_mutex_);
223223
--init_dart_api_times_;
@@ -227,7 +227,7 @@ EXPORT void Dispose()
227227
}
228228
}
229229

230-
EXPORT void OnEvent(EventParam *param)
230+
EXPORT void Iris_OnEvent(EventParam *param)
231231
{
232232
std::lock_guard<std::mutex> lock(message_handler_mutex_);
233233
if (dartMessageHandlerManager_)
@@ -236,7 +236,7 @@ EXPORT void OnEvent(EventParam *param)
236236
}
237237
}
238238

239-
EXPORT void RegisterDartPort(Dart_Port send_port)
239+
EXPORT void Iris_RegisterDartPort(Dart_Port send_port)
240240
{
241241
std::lock_guard<std::mutex> lock(message_handler_mutex_);
242242
if (dartMessageHandlerManager_)
@@ -245,7 +245,7 @@ EXPORT void RegisterDartPort(Dart_Port send_port)
245245
}
246246
}
247247

248-
EXPORT void UnregisterDartPort(Dart_Port send_port)
248+
EXPORT void Iris_UnregisterDartPort(Dart_Port send_port)
249249
{
250250
std::lock_guard<std::mutex> lock(message_handler_mutex_);
251251
if (dartMessageHandlerManager_)

src/iris_event.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ extern "C"
2727
} EventParam;
2828

2929
// Initialize `dart_api_dl.h`
30-
EXPORT intptr_t InitDartApiDL(void *data);
30+
EXPORT intptr_t Iris_InitDartApiDL(void *data);
3131

32-
EXPORT void Dispose();
32+
EXPORT void Iris_Dispose();
3333

34-
EXPORT void OnEvent(EventParam *param);
34+
EXPORT void Iris_OnEvent(EventParam *param);
3535

36-
EXPORT void RegisterDartPort(Dart_Port send_port);
36+
EXPORT void Iris_RegisterDartPort(Dart_Port send_port);
3737

38-
EXPORT void UnregisterDartPort(Dart_Port send_port);
38+
EXPORT void Iris_UnregisterDartPort(Dart_Port send_port);
3939

4040
#ifdef __cplusplus
4141
}

0 commit comments

Comments
 (0)