BUILD: 51d: fix build issue with recent compilers

With gcc-11.2 and binutils-2.37 I'm getting link errors due to multiply
defined symbols when enabling USE_51DEGREES_V4. This is caused by two
variables being present in hash.h instead of hash.c, hence they're
defined twice.

This patch just moves them to hash.c and turns their declaration to
extern.

No backport is needed since this was introduced in 2.8-dev.

diff --git a/addons/51degrees/dummy/v4hash/hash/hash.c b/addons/51degrees/dummy/v4hash/hash/hash.c
index 96e56050d99644e7daa3fc5986cb670309fe6efe..e9a739ed458382d6668aeae12dd5595b8ebac0fd 100644 (file)
--- a/addons/51degrees/dummy/v4hash/hash/hash.c
+++ b/addons/51degrees/dummy/v4hash/hash/hash.c
@@ -36,6 +36,9 @@
 static fiftyoneDegreesHeaders dummyHeaders = { };
 static fiftyoneDegreesDataSetBase dummyDataSet = { &dummyHeaders };
 
+fiftyoneDegreesConfigHash fiftyoneDegreesHashInMemoryConfig;
+fiftyoneDegreesPropertiesRequired fiftyoneDegreesPropertiesDefault;
+
 fiftyoneDegreesDataSetBase* fiftyoneDegreesDataSetGet(
        fiftyoneDegreesResourceManager *manager) {
        return &dummyDataSet;

diff --git a/addons/51degrees/dummy/v4hash/hash/hash.h b/addons/51degrees/dummy/v4hash/hash/hash.h
index d899f6a382f468dc374810cfb431b2f87c5f745e..5d04d176621c5b842e2bbcee46d17cfdb681eae7 100644 (file)
--- a/addons/51degrees/dummy/v4hash/hash/hash.h
+++ b/addons/51degrees/dummy/v4hash/hash/hash.h
@@ -189,7 +189,7 @@ typedef struct fiftyone_degrees_config_hash_t {
        bool usePredictiveGraph;
 } fiftyoneDegreesConfigHash;
 
-fiftyoneDegreesConfigHash fiftyoneDegreesHashInMemoryConfig;
+extern fiftyoneDegreesConfigHash fiftyoneDegreesHashInMemoryConfig;
 
 typedef struct fiftyone_degrees_property_available_t {
 
@@ -206,7 +206,7 @@ typedef struct fiftyone_degrees_properties_required_t {
        fiftyoneDegreesPropertiesAvailable *existing;
 } fiftyoneDegreesPropertiesRequired;
 
-fiftyoneDegreesPropertiesRequired fiftyoneDegreesPropertiesDefault;
+extern fiftyoneDegreesPropertiesRequired fiftyoneDegreesPropertiesDefault;
 
 typedef struct fiftyone_degrees_memory_reader_t {
        byte *startByte;