summaryrefslogtreecommitdiffstats
path: root/lasso
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2011-01-04 16:43:06 +0100
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2011-01-04 16:43:06 +0100
commit346071a6300032f17fcda345163bd5c444fb3c05 (patch)
tree4940b6c042dba018a270606c2613e7c55e5d8f33 /lasso
parent265f69e236282710bf3adb3d87251df5075f6b6f (diff)
downloadlasso-346071a6300032f17fcda345163bd5c444fb3c05.tar.gz
lasso-346071a6300032f17fcda345163bd5c444fb3c05.tar.xz
lasso-346071a6300032f17fcda345163bd5c444fb3c05.zip
[wsf] fix wsf preprocessor conditionals
Diffstat (limited to 'lasso')
-rw-r--r--lasso/id-ff/identity.c1
-rw-r--r--lasso/id-ff/login.c1
-rw-r--r--lasso/id-ff/profile.c1
-rw-r--r--lasso/id-ff/server.c1
-rw-r--r--lasso/id-ff/session.c1
-rw-r--r--lasso/xml/xml.c6
6 files changed, 9 insertions, 2 deletions
diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index 872909c2..74982292 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -41,6 +41,7 @@
#endif
#include "identityprivate.h"
+#include "../lasso_config.h"
/*****************************************************************************/
/* public methods */
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index b605aff5..ecd87360 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -268,6 +268,7 @@
#include "identityprivate.h"
#include "loginprivate.h"
#include "../saml-2.0/loginprivate.h"
+#include "../lasso_config.h"
#ifdef LASSO_WSF_ENABLED
#include "../id-wsf/id_ff_extensions_private.h"
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index ee0d10f8..c1c86daa 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -53,6 +53,7 @@
#include "../xml/idwsf_strings.h"
#include "../xml/id-wsf-2.0/idwsf2_strings.h"
#endif
+#include "../lasso_config.h"
/*****************************************************************************/
/* public functions */
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index b40ee5b2..22f253fe 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -40,6 +40,7 @@
#include "../saml-2.0/serverprivate.h"
#include "../utils.h"
#include "../debug.h"
+#include "../lasso_config.h"
#ifdef LASSO_WSF_ENABLED
#include "../id-wsf/id_ff_extensions_private.h"
#include "../id-wsf-2.0/serverprivate.h"
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 3e60c015..a64f3798 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -29,6 +29,7 @@
**/
#include "../xml/private.h"
+#include "../lasso_config.h"
#include "session.h"
#include "sessionprivate.h"
#include "../xml/saml_assertion.h"
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 5504c3fc..f4895316 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -54,8 +54,10 @@
#include "../debug.h"
#include "./soap-1.1/soap_envelope.h"
#include "./soap-1.1/soap_body.h"
-#if LASSO_WSF_ENABLED
+#include "../lasso_config.h"
+#ifdef LASSO_WSF_ENABLED
#include "./idwsf_strings.h"
+#include "./id-wsf-2.0/idwsf2_strings.h"
#endif
static void lasso_node_build_xmlNode_from_snippets(LassoNode *node, xmlNode *xmlnode,
@@ -2062,7 +2064,7 @@ static const char *
prefix_from_href_and_nodename(const xmlChar *href, G_GNUC_UNUSED const xmlChar *nodename) {
char *prefix = NULL;
#ifdef LASSO_WSF_ENABLED
- char *tmp = NULL
+ char *tmp = NULL;
#endif
if (strcmp((char*)href, LASSO_LASSO_HREF) == 0)