libmemcached/libmemcached-fix-multiple-definition.patch

33 lines
785 B
Diff
Raw Normal View History

--- a/clients/ms_memslap.h 2021-08-04 20:25:20.314194660 +0800
+++ b/clients/ms_memslap.h 2021-08-04 20:26:01.154700115 +0800
@@ -117,13 +117,13 @@
} ms_global_t;
/* global structure */
-ms_global_t ms_global;
+extern ms_global_t ms_global;
/* global stats information structure */
-ms_stats_t ms_stats;
+extern ms_stats_t ms_stats;
/* global statistic structure */
-ms_statistic_t ms_statistic;
+extern ms_statistic_t ms_statistic;
#ifdef __cplusplus
}
--- a/clients/ms_sigsegv.c 2014-02-09 19:52:42.000000000 +0800
+++ b/clients/ms_sigsegv.c 2021-08-04 20:35:49.725984452 +0800
@@ -21,6 +21,10 @@
#include <pthread.h>
#include "ms_memslap.h"
+ms_global_t ms_global;
+ms_stats_t ms_stats;
+ms_statistic_t ms_statistic;
+
#include "ms_setting.h"
/* prototypes */