Some corrections yet after build from scratch.

diff --git a/org.glite.jp.index/src/conf.h b/org.glite.jp.index/src/conf.h
index b89ef5d..cfdf588 100644 (file)
--- a/org.glite.jp.index/src/conf.h
+++ b/org.glite.jp.index/src/conf.h
@@ -5,10 +5,12 @@
 
 #include <glite/jp/types.h>
 
-#ifdef __GNUC__
-  #define UNUSED __attribute__((unused))
-#else
-  #define UNUSED
+#ifndef UNUSED
+  #ifdef __GNUC__
+    #define UNUSED __attribute__((unused))
+  #else
+    #define UNUSED
+  #endif
 #endif
 
 #define GLITE_JPIS_DEFAULT_PORT_STR "8902"

diff --git a/org.glite.jp.ws-interface/src/ws_fault.c b/org.glite.jp.ws-interface/src/ws_fault.c
index 896d627..255e98d 100644 (file)
--- a/org.glite.jp.ws-interface/src/ws_fault.c
+++ b/org.glite.jp.ws-interface/src/ws_fault.c
@@ -5,10 +5,12 @@
 #include <glite/jp/types.h>
 #include <glite/security/glite_gscompat.h>
 
-#ifdef __GNUC__
-  #define UNUSED __attribute__((unused))
-#else
-  #define UNUSED
+#ifndef UNUSED
+  #ifdef __GNUC__
+    #define UNUSED __attribute__((unused))
+  #else
+    #define UNUSED
+  #endif
 #endif
 
 #define GSOAP_STRING(CHOICE) GLITE_SECURITY_GSOAP_CHOICE_GET(CHOICE, string, stringOrBlob, 1)
@@ -137,5 +139,3 @@ static void glite_jp_server_err2fault(const glite_jp_context_t ctx,struct soap *
        if (soap->version == 2) soap->fault->SOAP_ENV__Detail = detail;
        else soap->fault->detail = detail;
 }
-
-#undef UNUSED