Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix upstream missing USE_TLS macro guard #242

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

Jump to bottom
Merged
filipecosta90 merged 3 commits into from
Dec 21, 2023
Merged

Fix upstream missing USE_TLS macro guard #242

filipecosta90 merged 3 commits into from
Dec 21, 2023

Conversation

@Alkaid-Benetnash
Copy link
Contributor

@Alkaid-Benetnash Alkaid-Benetnash commented Nov 29, 2023

The current master as of 9ddfcff fails to build without TLS.
It seems that changes from bec3471 were not guarded by the correct macro.

memtier_benchmark.cpp:320:15: error: no member named 'tls_protocols' in 'benchmark_config'
  320 |     if (!cfg->tls_protocols)                                               
      |          ~~~  ^                                                            
memtier_benchmark.cpp:321:14: error: no member named 'tls_protocols' in 'benchmark_config'
  321 |         cfg->tls_protocols = REDIS_TLS_PROTO_DEFAULT;                      
      |         ~~~  ^                                                             
memtier_benchmark.cpp:321:30: error: use of undeclared identifier 'REDIS_TLS_PROTO_DEFAULT'
  321 |         cfg->tls_protocols = REDIS_TLS_PROTO_DEFAULT;                      
      |                              ^                                             
memtier_benchmark.cpp:330:16: warning: variable 'ignore' set but not used [-Wunused-but-set-variable]
  330 |         size_t ignore = fread(&R, sizeof(R), 1, f);                        
      |                ^

filipecosta90
filipecosta90 previously approved these changes Dec 21, 2023
View reviewed changes
Copy link
Collaborator

@filipecosta90 filipecosta90 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @Alkaid-Benetnash ! Approving.
PS: added a build variant to track/avoid this issue in the future.

@filipecosta90 filipecosta90 self-requested a review December 21, 2023 18:44
@filipecosta90 filipecosta90 merged commit 912a6da into redis:master Dec 21, 2023
@Alkaid-Benetnash Alkaid-Benetnash deleted the fix-tls-build-error branch January 18, 2024 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@filipecosta90 filipecosta90 filipecosta90 approved these changes

@YaacovHazan YaacovHazan Awaiting requested review from YaacovHazan

Assignees

No one assigned

Labels

bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Alkaid-Benetnash @filipecosta90