@@ -39,31 +39,27 @@ RIME_API void LoadModules(const char* module_names[]) {
39
39
}
40
40
}
41
41
42
- // assume member is a non-null pointer in struct *p.
43
- #define PROVIDED (p, member ) \
44
- ((p) && RIME_STRUCT_HAS_MEMBER(*(p), (p)->member) && (p)->member)
45
-
46
42
RIME_API void SetupDeployer (RimeTraits* traits) {
47
43
if (!traits)
48
44
return ;
49
45
Deployer& deployer (Service::instance ().deployer ());
50
- if (PROVIDED (traits, shared_data_dir))
46
+ if (RIME_PROVIDED (traits, shared_data_dir))
51
47
deployer.shared_data_dir = path (traits->shared_data_dir );
52
- if (PROVIDED (traits, user_data_dir))
48
+ if (RIME_PROVIDED (traits, user_data_dir))
53
49
deployer.user_data_dir = path (traits->user_data_dir );
54
- if (PROVIDED (traits, distribution_name))
50
+ if (RIME_PROVIDED (traits, distribution_name))
55
51
deployer.distribution_name = traits->distribution_name ;
56
- if (PROVIDED (traits, distribution_code_name))
52
+ if (RIME_PROVIDED (traits, distribution_code_name))
57
53
deployer.distribution_code_name = traits->distribution_code_name ;
58
- if (PROVIDED (traits, distribution_version))
54
+ if (RIME_PROVIDED (traits, distribution_version))
59
55
deployer.distribution_version = traits->distribution_version ;
60
- if (PROVIDED (traits, app_name))
56
+ if (RIME_PROVIDED (traits, app_name))
61
57
deployer.app_name = traits->app_name ;
62
- if (PROVIDED (traits, prebuilt_data_dir))
58
+ if (RIME_PROVIDED (traits, prebuilt_data_dir))
63
59
deployer.prebuilt_data_dir = path (traits->prebuilt_data_dir );
64
60
else
65
61
deployer.prebuilt_data_dir = deployer.shared_data_dir / " build" ;
66
- if (PROVIDED (traits, staging_dir))
62
+ if (RIME_PROVIDED (traits, staging_dir))
67
63
deployer.staging_dir = path (traits->staging_dir );
68
64
else
69
65
deployer.staging_dir = deployer.user_data_dir / " build" ;
0 commit comments