cmake: Fix the include guards in rfbconfig.h#693
Merged
bk138 merged 1 commit intoLibVNC:masterfrom Mar 10, 2026
Merged
Conversation
The include guard shouldn't be a cmakedefine - this is not a 0/1
define that we expect cmake to configure, it should always be
defined here.
This avoids warnings like this (when building with Clang, targeting
Windows), due to rfbconfig.h being included multiple times, when
building with CMake:
libvncserver/build/include/rfb/rfbconfig.h:197:13: warning: redefinition of typedef 'socklen_t' is a C11 feature [-Wtypedef-redefinition]
197 | typedef int socklen_t;
| ^
libvncserver/include/rfb/rfbproto.h:70:10: note: 'libvncserver/build/include/rfb/rfbconfig.h' included multiple times, additional include site here
70 | #include <rfb/rfbconfig.h>
| ^
libvncserver/include/rfb/threading.h:25:10: note: 'libvncserver/build/include/rfb/rfbconfig.h' included multiple times, additional include site here
25 | #include <rfb/rfbconfig.h>
| ^
Member
|
That is of course right, thanks for spotting! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The include guard shouldn't be a cmakedefine - this is not a 0/1 define that we expect cmake to configure, it should always be defined here.
This avoids warnings like this (when building with Clang, targeting Windows), due to rfbconfig.h being included multiple times, when building with CMake: