diff options
| author | Binbin <binloveplay1314@qq.com> | 2022-11-27 16:18:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 10:18:48 +0200 |
| commit | a7cecf37133869d8de3bdcc54626e101989d1140 (patch) | |
| tree | e6f6cb0339d9d9e43c50cc88ef97c5b7eded5d01 /src/multi.c | |
| parent | 24282a381a89cc8281c57ceedcca5f7eb404d396 (diff) | |
| download | redis-a7cecf37133869d8de3bdcc54626e101989d1140.tar.gz | |
Add redis_ prefix for member2struct, avoid redefined warning in FreeBSD (#11549)
It look like it will generate a warning in FreeBSD:
```
./server.h:105:9: warning: 'member2struct' macro redefined [-Wmacro-redefined]
#define member2struct(struct_name, member_name, member_addr) \
^
/usr/include/sys/param.h:365:9: note: previous definition is here
#define member2struct(s, m, x) \
^
```
Add a `redis_` prefix to it, avoid the warning, introduced in #11511
Diffstat (limited to 'src/multi.c')
| -rw-r--r-- | src/multi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multi.c b/src/multi.c index d3a91e866..48b5d15d6 100644 --- a/src/multi.c +++ b/src/multi.c @@ -387,7 +387,7 @@ void touchWatchedKey(redisDb *db, robj *key) { /* Check if we are already watching for this key */ listRewind(clients,&li); while((ln = listNext(&li))) { - watchedKey *wk = member2struct(watchedKey, node, ln); + watchedKey *wk = redis_member2struct(watchedKey, node, ln); client *c = wk->client; if (wk->expired) { @@ -440,7 +440,7 @@ void touchAllWatchedKeysInDb(redisDb *emptied, redisDb *replaced_with) { if (!clients) continue; listRewind(clients,&li); while((ln = listNext(&li))) { - watchedKey *wk = member2struct(watchedKey, node, ln); + watchedKey *wk = redis_member2struct(watchedKey, node, ln); if (wk->expired) { if (!replaced_with || !dictFind(replaced_with->dict, key->ptr)) { /* Expired key now deleted. No logical change. Clear the |