Skip to content

Commit 31cb98c

Browse files
Merge pull request #180 from SWISensorHub/pr_g_client_multiple_definitions
Fix multiple definitions of g_client error
2 parents d474230 + 71d0063 commit 31cb98c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

erpc_c/setup/erpc_arbitrated_client_setup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ using namespace erpc;
3232

3333
// global client variables
3434
static ManuallyConstructed<ArbitratedClientManager> s_client;
35-
extern ClientManager *g_client;
36-
ClientManager *g_client = NULL;
35+
ClientManager *g_client;
36+
#pragma weak g_client
3737

3838
static ManuallyConstructed<BasicCodecFactory> s_codecFactory;
3939
static ManuallyConstructed<TransportArbitrator> s_arbitrator;

erpc_c/setup/erpc_client_setup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ using namespace erpc;
3030

3131
// global client variables
3232
static ManuallyConstructed<ClientManager> s_client;
33-
extern ClientManager *g_client;
34-
ClientManager *g_client = NULL;
33+
ClientManager *g_client;
34+
#pragma weak g_client
3535
static ManuallyConstructed<BasicCodecFactory> s_codecFactory;
3636
static ManuallyConstructed<Crc16> s_crc16;
3737

0 commit comments

Comments
 (0)