Mercurial > hg > freeDiameter
changeset 854:51a056d78aba
Resolve conflict on duplicated fd_g_config pointer
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Sun, 21 Oct 2012 18:37:20 +0200 |
| parents | 16428c4ecb22 |
| children | 2eb6882b20c6 |
| files | tests/tests.h |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/tests.h Sun Oct 21 17:41:02 2012 +0200 +++ b/tests/tests.h Sun Oct 21 18:37:20 2012 +0200 @@ -82,7 +82,7 @@ static int test_verbo = 0; static struct fd_config conf; -struct fd_config * fd_g_config = &conf; +extern struct fd_config * fd_g_config; /* Define the standard check routines */ #define CHECK( _val, _assert ){ \ @@ -192,6 +192,7 @@ CHECK( 0, pthread_sigmask(SIG_BLOCK, &sig_all, NULL)); + fd_g_config = &conf; memset(fd_g_config, 0, sizeof(struct fd_config)); CHECK( 0, fd_libproto_init() );