Changeset 854:51a056d78aba in freeDiameter

Timestamp:

Oct 22, 2012, 1:37:20 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Resolve conflict on duplicated fd_g_config pointer

File:

• tests/tests.h (modified) (2 diffs)

tests/tests.h

@@ -83 +83 @@
 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 */
@@ -193 +193 @@
         CHECK( 0, pthread_sigmask(SIG_BLOCK, &sig_all, NULL));
         
+        fd_g_config = &conf;
         memset(fd_g_config, 0, sizeof(struct fd_config));