cleaned headerfiles defines - there were some duplicities causing build failures

diff --git a/org.glite.lb.client/interface/Job.h b/org.glite.lb.client/interface/Job.h
index 552da34..771036f 100644 (file)
--- a/org.glite.lb.client/interface/Job.h
+++ b/org.glite.lb.client/interface/Job.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_JOB_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_JOB_HPP__
+#ifndef __GLITE_LB_JOB_HPP__
+#define __GLITE_LB_JOB_HPP__
 
 #ident "$Header$"
 
@@ -189,4 +189,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif
+#endif /* __GLITE_LB_JOB_HPP__ */

diff --git a/org.glite.lb.client/interface/JobStatus.h.T b/org.glite.lb.client/interface/JobStatus.h.T
index 94a1866..3c043e7 100644 (file)
--- a/org.glite.lb.client/interface/JobStatus.h.T
+++ b/org.glite.lb.client/interface/JobStatus.h.T
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTATUS_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTATUS_HPP__
+#ifndef __GLITE_LB_JOBSTATUS_HPP__
+#define __GLITE_LB_JOBSTATUS_HPP__
 
 /*
 @@@AUTO
@@ -285,5 +285,4 @@ private:
 
 EWL_END_NAMESPACE;
 
-#endif
-
+#endif /* __GLITE_LB_JOBSTATUS_HPP__ */

diff --git a/org.glite.lb.client/interface/Notification.h b/org.glite.lb.client/interface/Notification.h
index 36a4930..361a171 100644 (file)
--- a/org.glite.lb.client/interface/Notification.h
+++ b/org.glite.lb.client/interface/Notification.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_HPP__
+#ifndef __GLITE_LB_NOTIFICATION_HPP__
+#define __GLITE_LB_NOTIFICATION_HPP__
 
 
 #include "glite/wmsutils/jobid/JobId.h"
@@ -93,4 +93,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif
+#endif /* __GLITE_LB_NOTIFICATION_HPP__ */

diff --git a/org.glite.lb.client/interface/ServerConnection.h b/org.glite.lb.client/interface/ServerConnection.h
index 9780803..0efbed0 100644 (file)
--- a/org.glite.lb.client/interface/ServerConnection.h
+++ b/org.glite.lb.client/interface/ServerConnection.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_SERVERCONNECTION_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_SERVERCONNECTION_HPP__
+#ifndef __GLITE_LB_SERVERCONNECTION_HPP__
+#define __GLITE_LB_SERVERCONNECTION_HPP__
 
 #ident "$Header$"
 
@@ -732,4 +732,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif
+#endif /* __GLITE_LB_SERVERCONNECTION_HPP__ */

diff --git a/org.glite.lb.client/interface/consumer.h b/org.glite.lb.client/interface/consumer.h
index 6760775..3561388 100644 (file)
--- a/org.glite.lb.client/interface/consumer.h
+++ b/org.glite.lb.client/interface/consumer.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__
+#ifndef __GLITE_LB_CONSUMER_H__
+#define __GLITE_LB_CONSUMER_H__
 
 /*!
  * \file consumer.h
@@ -17,6 +17,8 @@
 extern "C" {
 #endif
 
+#include "glite/lb/query_rec.h"
+
 /**
  * \defgroup Functions for Server querying
  * \brief The core part of the LB querying API.
@@ -332,4 +334,4 @@ extern int set_server_name_and_port(
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__ */
+#endif /* __GLITE_LB_CONSUMER_H__ */

diff --git a/org.glite.lb.client/interface/consumer_fake.h b/org.glite.lb.client/interface/consumer_fake.h
index c3fc28f..f71c6f4 100644 (file)
--- a/org.glite.lb.client/interface/consumer_fake.h
+++ b/org.glite.lb.client/interface/consumer_fake.h
@@ -1,10 +1,10 @@
+#ifndef __GLITE_LB_CONSUMER_FAKE_H__
+#define __GLITE_LB_CONSUMER_FAKE_H__
+
 /* 
  * fake implementation of the consumer API 
  */
 
-#ifndef WORKLOAD_LOGGING_CLIENT_CONSUMER_FAKE_H
-#define WORKLOAD_LOGGING_CLIENT_CONSUMER_FAKE_H
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -23,4 +23,4 @@ void edg_wll_UnregisterTestQueryListener();
 }
 #endif
 
-#endif /* WORKLOAD_LOGGING_CLIENT_CONSUMER_FAKE_H */
+#endif /* __GLITE_LB_CONSUMER_FAKE_H__ */

diff --git a/org.glite.lb.client/interface/dump.h b/org.glite.lb.client/interface/dump.h
index 37f9dd7..6cc2ca1 100644 (file)
--- a/org.glite.lb.client/interface/dump.h
+++ b/org.glite.lb.client/interface/dump.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_DUMP_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_DUMP_H__
+#ifndef __GLITE_LB_DUMP_H__
+#define __GLITE_LB_DUMP_H__
 
 #ident "$Header$"
 
@@ -26,6 +26,4 @@ int edg_wll_DumpEvents(
        edg_wll_DumpResult *
 );
 
-
-#endif
-
+#endif /* __GLITE_LB_DUMP_H__ */

diff --git a/org.glite.lb.client/interface/load.h b/org.glite.lb.client/interface/load.h
index 5ca8ead..c675493 100644 (file)
--- a/org.glite.lb.client/interface/load.h
+++ b/org.glite.lb.client/interface/load.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_LOAD_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_LOAD_H__
+#ifndef __GLITE_LB_LOAD_H__
+#define __GLITE_LB_LOAD_H__
 
 #ident "$Header$"
 
@@ -23,5 +23,4 @@ int edg_wll_LoadEvents(
        edg_wll_LoadResult *
 );
 
-#endif
-
+#endif /* __GLITE_LB_LOAD_H__ */

diff --git a/org.glite.lb.client/interface/notification.h b/org.glite.lb.client/interface/notification.h
index af5e893..6b8a6c0 100644 (file)
--- a/org.glite.lb.client/interface/notification.h
+++ b/org.glite.lb.client/interface/notification.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_H__
+#ifndef __GLITE_LB_NOTIFICATION_H__
+#define __GLITE_LB_NOTIFICATION_H__
 
 #ident "$Header$"
 
@@ -177,4 +177,4 @@ int edg_wll_NotifCloseFd(
 }
 #endif
 
-#endif
+#endif /* __GLITE_LB_NOTIFICATION_H__ */

diff --git a/org.glite.lb.client/interface/producer.h.T b/org.glite.lb.client/interface/producer.h.T
index 826aa4f..468fada 100644 (file)
--- a/org.glite.lb.client/interface/producer.h.T
+++ b/org.glite.lb.client/interface/producer.h.T
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_PRODUCER_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_PRODUCER_H__
+#ifndef __GLITE_LB_PRODUCER_H__
+#define __GLITE_LB_PRODUCER_H__
 
 /**
  * \file producer.h
@@ -450,4 +450,4 @@ extern int edg_wll_ChangeACL(
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_PRODUCER_H__ */
+#endif /* __GLITE_LB_PRODUCER_H__ */

diff --git a/org.glite.lb.client/interface/producer_fake.h b/org.glite.lb.client/interface/producer_fake.h
index 1c75700..0d13404 100644 (file)
--- a/org.glite.lb.client/interface/producer_fake.h
+++ b/org.glite.lb.client/interface/producer_fake.h
@@ -1,10 +1,10 @@
+#ifndef __GLITE_LB_PRODUCER_FAKE_H__
+#define __GLITE_LB_PRODUCER_FAKE_H
+
 /* 
  * fake implementation of the producer API
  */
 
-#ifndef WORKLOAD_LOGGING_CLIENT_PRODUCER_FAKE_H
-#define WORKLOAD_LOGGING_CLIENT_PRODUCER_FAKE_H
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,4 +22,4 @@ void edg_wll_UnregisterTestLoggingProxy();
 }
 #endif
 
-#endif /* WORKLOAD_LOGGING_CLIENT_PRODUCER_FAKE_H */
+#endif /* __GLITE_LB_PRODUCER_FAKE_H__ */

diff --git a/org.glite.lb.client/interface/purge.h b/org.glite.lb.client/interface/purge.h
index 531c903..6fe45a5 100644 (file)
--- a/org.glite.lb.client/interface/purge.h
+++ b/org.glite.lb.client/interface/purge.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_PURGE_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_PURGE_H__
+#ifndef __GLITE_LB_PURGE_H__
+#define __GLITE_LB_PURGE_H__
 
 #ident "$Header$"
 
@@ -56,4 +56,4 @@ int edg_wll_Purge(
        edg_wll_PurgeResult     *result
 );
 
-#endif
+#endif /* __GLITE_LB_PURGE_H__ */

diff --git a/org.glite.lb.client/interface/statistics.h b/org.glite.lb.client/interface/statistics.h
index 4c2027d..f7bb4f2 100644 (file)
--- a/org.glite.lb.client/interface/statistics.h
+++ b/org.glite.lb.client/interface/statistics.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_STATISTICS_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_STATISTICS_H__
+#ifndef __GLITE_LB_STATISTICS_H__
+#define __GLITE_LB_STATISTICS_H__
 
 #include "consumer.h"
 
@@ -53,5 +53,4 @@ int edg_wll_StateDuration(
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__ */
-
+#endif /* __GLITE_LB_CONSUMER_H__ */