From 67cb831eae0224bd80786305cf73fe05c692b29c Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 9 Jun 2016 15:31:01 -0400 Subject: Fix duplicate dispatch vectors when building for RPC_CLIENT_LOCAL. --- rpc_client.c | 11 +++++------ rpc_server.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rpc_client.c b/rpc_client.c index 3ac6d6e..c92571b 100644 --- a/rpc_client.c +++ b/rpc_client.c @@ -971,15 +971,14 @@ const hal_rpc_pkey_dispatch_t hal_rpc_mixed_pkey_dispatch = { #endif /* RPC_CLIENT != RPC_CLIENT_LOCAL */ -#if RPC_CLIENT == RPC_CLIENT_LOCAL -const hal_rpc_misc_dispatch_t * hal_rpc_misc_dispatch = &hal_rpc_local_misc_dispatch; -const hal_rpc_hash_dispatch_t * hal_rpc_hash_dispatch = &hal_rpc_local_hash_dispatch; -const hal_rpc_pkey_dispatch_t * hal_rpc_pkey_dispatch = &hal_rpc_local_pkey_dispatch; -#elif RPC_CLIENT == RPC_CLIENT_REMOTE + +#if RPC_CLIENT == RPC_CLIENT_REMOTE const hal_rpc_misc_dispatch_t * hal_rpc_misc_dispatch = &hal_rpc_remote_misc_dispatch; const hal_rpc_hash_dispatch_t * hal_rpc_hash_dispatch = &hal_rpc_remote_hash_dispatch; const hal_rpc_pkey_dispatch_t * hal_rpc_pkey_dispatch = &hal_rpc_remote_pkey_dispatch; -#elif RPC_CLIENT == RPC_CLIENT_MIXED +#endif + +#if RPC_CLIENT == RPC_CLIENT_MIXED const hal_rpc_misc_dispatch_t * hal_rpc_misc_dispatch = &hal_rpc_remote_misc_dispatch; const hal_rpc_hash_dispatch_t * hal_rpc_hash_dispatch = &hal_rpc_local_hash_dispatch; const hal_rpc_pkey_dispatch_t * hal_rpc_pkey_dispatch = &hal_rpc_mixed_pkey_dispatch; diff --git a/rpc_server.c b/rpc_server.c index a1bca26..65ba6bb 100644 --- a/rpc_server.c +++ b/rpc_server.c @@ -738,9 +738,11 @@ void hal_rpc_server_main(void) * Dispatch vectors. */ +#if RPC_CLIENT == RPC_CLIENT_LOCAL const hal_rpc_misc_dispatch_t *hal_rpc_misc_dispatch = &hal_rpc_local_misc_dispatch; const hal_rpc_hash_dispatch_t *hal_rpc_hash_dispatch = &hal_rpc_local_hash_dispatch; const hal_rpc_pkey_dispatch_t *hal_rpc_pkey_dispatch = &hal_rpc_local_pkey_dispatch; +#endif hal_error_t hal_rpc_server_init(void) { -- cgit v1.2.3