Skip to content

Avoid definitions of RedisModuleSDK symbols #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid definitions of RedisModuleSDK symbols #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2312964
Avoid definitions of RedisModule symbols
rafie Oct 23, 2022
290d17d
Fix build problem in CI
rafie Oct 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
- run:
name: get readies
command: git clone https://github.com/RedisLabsModules/readies.git
- run:
name: Install gcc-9
command: ./readies/bin/getgcc --modern
- run:
name: Install python3
command: ./readies/bin/getpy3
- run:
name: Install gcc-9
command: ./readies/bin/getgcc --modern
- run:
name: Install rust
command: ./readies/bin/getrust
Expand Down
15 changes: 15 additions & 0 deletions src/redismodule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
#ifndef REDISMODULE_H
#define REDISMODULE_H

// clang-format off

#include <sys/types.h>
#include <stdint.h>
#include <stdio.h>

#ifdef __cplusplus
extern "C" {
#endif

/* ---------------- Defines common between core and modules --------------- */

/* Error status return values. */
Expand Down Expand Up @@ -567,6 +573,10 @@ typedef struct RedisModuleTypeMethods {
RedisModule_GetApi("RedisModule_" #name, ((void **)&RedisModule_ ## name))

/* Default API declaration prefix (not 'extern' for backwards compatibility) */
#ifndef REDISMODULE_MAIN
#define REDISMODULE_API extern
#endif

#ifndef REDISMODULE_API
#define REDISMODULE_API
#endif
Expand Down Expand Up @@ -1134,4 +1144,9 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int
#define RedisModuleString robj

#endif /* REDISMODULE_CORE */

#ifdef __cplusplus
}
#endif

#endif /* REDISMODULE_H */