From: Jennifer Richards Date: Fri, 9 Sep 2016 18:56:31 +0000 (-0400) Subject: Merge branch 'master' into jennifer/trp-devel X-Git-Tag: v2.0~2 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=1b419d2f80dd88c79565bece98dfcb591e722b3e;hp=b0dd8d735286754d6cc6ba0b6ead7d25b0d81f15 Merge branch 'master' into jennifer/trp-devel --- diff --git a/gsscon/gsscon_active.c b/gsscon/gsscon_active.c index f8dc166..1f4d91f 100755 --- a/gsscon/gsscon_active.c +++ b/gsscon/gsscon_active.c @@ -54,6 +54,7 @@ #include #include +#include #include @@ -85,7 +86,7 @@ int gsscon_connect (const char *inHost, unsigned int inPort, const char *inServi if (!err) { hp = gethostbyname (inHost); - if (hp == NULL) { err = errno; } + if (hp == NULL) { err = h_errno; } } if (!err) {