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

Author: jengelh

src/vmime/security/sasl/SASLContext.hpp

@@ -30,6 +30,7 @@
 
 #if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT
 
+#include <gsasl.h>
 
 #include "vmime/types.hpp"
 
@@ -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
-
 };
 
 

src/vmime/security/sasl/SASLSession.hpp

@@ -30,6 +30,7 @@
 
 #if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT
 
+#include <gsasl.h>
 
 #include "vmime/types.hpp"
 
@@ -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
-
 };