diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-25 09:59:20 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-25 09:59:20 -0800 |
| commit | 194824467c8d014123a8a3cc8f4ad65b6f9a9b85 (patch) | |
| tree | 15d374907ebee9eed8be67025586517f53ba6f6f /src/core/channel/channel_args.c | |
| parent | 5de79ee59f526f1eb0125d6544aaccdf5527afb4 (diff) | |
Get subchannel index working
Diffstat (limited to 'src/core/channel/channel_args.c')
| -rw-r--r-- | src/core/channel/channel_args.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/channel/channel_args.c b/src/core/channel/channel_args.c index 6ac6b99475..63e440f97b 100644 --- a/src/core/channel/channel_args.c +++ b/src/core/channel/channel_args.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -93,7 +93,7 @@ grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a, } static int cmp_arg(const grpc_arg *a, const grpc_arg *b) { - int c = a->type - b->type; + int c = GPR_ICMP(a->type, b->type); if (c != 0) return c; c = strcmp(a->key, b->key); if (c != 0) return c; |