From: František Dvořák <valtri@civ.zcu.cz>
Date: Sun, 18 Mar 2007 10:37:56 +0000 (+0000)
Subject: Remaining fixes due to gSoap 2.7.6b.
X-Git-Tag: glite-security-gsoap-plugin_R_1_4_3_1~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=baa327ea2591e757136f6af4d76c19ddbba26763;p=jra1mw.git

Remaining fixes due to gSoap 2.7.6b.
---

diff --git a/org.glite.security.gsoap-plugin/interface/glite_gscompat.h b/org.glite.security.gsoap-plugin/interface/glite_gscompat.h
index c8df9fc..163f0ba 100644
--- a/org.glite.security.gsoap-plugin/interface/glite_gscompat.h
+++ b/org.glite.security.gsoap-plugin/interface/glite_gscompat.h
@@ -13,8 +13,8 @@
   #define GLITE_SECURITY_GSOAP_CHOICE_ISTYPE(CHOICE, ITEM, NS, TYPENAME, TYPENO) (((CHOICE)->__union_##TYPENAME) == SOAP_UNION__##NS##__union_##TYPENAME##_##ITEM)
 #elif GSOAP_VERSION >= 20706
   #define GLITE_SECURITY_GSOAP_CHOICE_GET(CHOICE, ITEM, TYPENAME, TYPENO) ((CHOICE)->union_##TYPENO.ITEM)
-  #define GLITE_SECURITY_GSOAP_CHOICE_SETTYPE(CHOICE, ITEM, NS, TYPENAME, TYPENO) ((CHOICE)->__union_##TYPENO) = SOAP_UNION__##NS##__union_##TYPENO##_##ITEM
-  #define GLITE_SECURITY_GSOAP_CHOICE_ISTYPE(CHOICE, ITEM, NS, TYPENAME, TYPENO) (((CHOICE)->__union_##TYPENO) == SOAP_UNION__##NS##__union_##TYPENO##_##ITEM)
+  #define GLITE_SECURITY_GSOAP_CHOICE_SETTYPE(CHOICE, ITEM, NS, TYPENAME, TYPENO) ((CHOICE)->__union_##TYPENO) = SOAP_UNION_##NS##__union_##TYPENO##_##ITEM
+  #define GLITE_SECURITY_GSOAP_CHOICE_ISTYPE(CHOICE, ITEM, NS, TYPENAME, TYPENO) (((CHOICE)->__union_##TYPENO) == SOAP_UNION_##NS##__union_##TYPENO##_##ITEM)
 #else
   #define GLITE_SECURITY_GSOAP_CHOICE_GET(CHOICE, ITEM, TYPENAME, TYPENO) ((CHOICE)->ITEM)
   #define GLITE_SECURITY_GSOAP_CHOICE_SETTYPE(CHOICE, ITEM, NS, TYPENAME, TYPENO)