Skip to content

build: avoid ODR violation from different struct layout per TU #326

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

Merged
vincent-richard merged 1 commit into from
Jul 21, 2025
Merged

build: avoid ODR violation from different struct layout per TU #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions src/vmime/security/sasl/SASLContext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT

#include <gsasl.h>

#include "vmime/types.hpp"

Expand Down Expand Up @@ -116,13 +117,7 @@ class VMIME_EXPORT SASLContext : public object, public enable_shared_from_this <

static const string getErrorMessage(const string& fname, const int code);


#ifdef GSASL_VERSION
Gsasl* m_gsaslContext;
#else
void* m_gsaslContext;
#endif // GSASL_VERSION

};


Expand Down
9 changes: 1 addition & 8 deletions src/vmime/security/sasl/SASLSession.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT

#include <gsasl.h>

#include "vmime/types.hpp"

Expand Down Expand Up @@ -155,18 +156,10 @@ class VMIME_EXPORT SASLSession : public object, public enable_shared_from_this <
shared_ptr <authenticator> m_auth;
shared_ptr <SASLMechanism> m_mech;

#ifdef GSASL_VERSION
Gsasl* m_gsaslContext;
Gsasl_session* m_gsaslSession;

static int gsaslCallback(Gsasl* ctx, Gsasl_session* sctx, Gsasl_property prop);
#else
void* m_gsaslContext;
void* m_gsaslSession;

static int gsaslCallback(void* ctx, void* sctx, int prop);
#endif // GSASL_VERSION

};


Expand Down