cleaned headerfiles defines - there were some duplicities causing build failures

diff --git a/org.glite.lb.common/interface/CountRef.h b/org.glite.lb.common/interface/CountRef.h
index 13250ee..01cf974 100644 (file)
--- a/org.glite.lb.common/interface/CountRef.h
+++ b/org.glite.lb.common/interface/CountRef.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_COUNTREF_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_COUNTREF_HPP__
+#ifndef __GLITE_LB_COUNT_REF_HPP__
+#define __GLITE_LB_COUNT_REF_HPP__
 
 /**
  * Switching into glite.lb namespace (couple with EWL_END_NAMESPACE).
@@ -77,4 +77,4 @@ void CountRef<T>::use(void)
 
 EWL_END_NAMESPACE
 
-#endif
+#endif /* __GLITE_LB_COUNT_REF_HPP__ */

diff --git a/org.glite.lb.common/interface/Event.h.T b/org.glite.lb.common/interface/Event.h.T
index 074d181..8777d32 100644 (file)
--- a/org.glite.lb.common/interface/Event.h.T
+++ b/org.glite.lb.common/interface/Event.h.T
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_EVENT_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_EVENT_HPP__
+#ifndef __GLITE_LB_EVENT_HPP__
+#define __GLITE_LB_EVENT_HPP__
 
 
 #ident "$Header$"
@@ -274,4 +274,4 @@ private:
 
 EWL_END_NAMESPACE
 
-#endif
+#endif /* __GLITE_LB_EVENT_HPP__ */

diff --git a/org.glite.lb.common/interface/LoggingExceptions.h b/org.glite.lb.common/interface/LoggingExceptions.h
index 5b791bf..ee56cc6 100644 (file)
--- a/org.glite.lb.common/interface/LoggingExceptions.h
+++ b/org.glite.lb.common/interface/LoggingExceptions.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_LOGGING_EXCEPTIONS_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_LOGGING_EXCEPTIONS_HPP__
+#ifndef __GLITE_LB_LOGGING_EXCEPTIONS_HPP__
+#define __GLITE_LB_LOGGING_EXCEPTIONS_HPP__
 
 #ident "$Header$"
 
@@ -273,4 +273,4 @@ public:
 
 EWL_END_NAMESPACE
 
-#endif
+#endif /* __GLITE_LB_LOGGING_EXCEPTIONS_HPP__ */

diff --git a/org.glite.lb.common/interface/authz.h b/org.glite.lb.common/interface/authz.h
index ccb02ad..2039d4b 100644 (file)
--- a/org.glite.lb.common/interface/authz.h
+++ b/org.glite.lb.common/interface/authz.h
@@ -1,5 +1,5 @@
-#ifndef _LB_AUTHZ_H
-#define _LB_AUTHZ_H
+#ifndef __GLITE_LB_AUTHZ_H__
+#define __GLITE_LB_AUTHZ_H__
 
 #ident "$Header$"
 
@@ -21,4 +21,4 @@ typedef struct _edg_wll_VomsGroups {
 }
 #endif
 
-#endif
+#endif /* __GLITE_LB_AUTHZ_H__ */

diff --git a/org.glite.lb.common/interface/connpool.h b/org.glite.lb.common/interface/connpool.h
index 4197bd2..6d1cc54 100644 (file)
--- a/org.glite.lb.common/interface/connpool.h
+++ b/org.glite.lb.common/interface/connpool.h
@@ -1,3 +1,6 @@
+#ifndef __GLITE_LB_CONNPOOL_H__
+#define __GLITE_LB_CONNPOOL_H__
+
 #include "glite/security/glite_gss.h"
 #include "context.h"
 #include "lb_plain_io.h"
@@ -95,3 +98,4 @@ edg_wll_Connections* edg_wll_initConnections();
 }
 #endif
 
+#endif /* __GLITE_LB_CONNPOOL_H__ */

diff --git a/org.glite.lb.common/interface/context-int.h b/org.glite.lb.common/interface/context-int.h
index bd80721..72e8627 100644 (file)
--- a/org.glite.lb.common/interface/context-int.h
+++ b/org.glite.lb.common/interface/context-int.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_CONTEXT_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_CONTEXT_H__
+#ifndef __GLITE_LB_CONTEXT_INT_H__
+#define __GLITE_LB_CONTEXT_INT_H__
 
 #ident "$Header$"
 
@@ -176,4 +176,5 @@ extern void edg_wll_FreeParams(edg_wll_Context context);
 #ifdef __cplusplus
 }
 #endif
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_CONTEXT_H__ */
+
+#endif /* __GLITE_LB_CONTEXT_INT_H__ */

diff --git a/org.glite.lb.common/interface/context.h b/org.glite.lb.common/interface/context.h
index c3c347b..d306dc6 100644 (file)
--- a/org.glite.lb.common/interface/context.h
+++ b/org.glite.lb.common/interface/context.h
@@ -1,5 +1,5 @@
-#ifndef _EDG_WORKLOAD_LOGGING_CLIENT_CONTEXT_H
-#define _EDG_WORKLOAD_LOGGING_CLIENT_CONTEXT_H
+#ifndef __GLITE_LB_CONTEXT_H__
+#define __GLITE_LB_CONTEXT_H__
 
 /**
  * \file context.h
@@ -275,4 +275,4 @@ int edg_wll_GetLoggingJob(
 }
 #endif
 
-#endif 
+#endif /* __GLITE_LB_CONTEXT_H__ */

diff --git a/org.glite.lb.common/interface/escape.h b/org.glite.lb.common/interface/escape.h
index 4cf54c0..acaea56 100644 (file)
--- a/org.glite.lb.common/interface/escape.h
+++ b/org.glite.lb.common/interface/escape.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_ESCAPE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_ESCAPE_H__
+#ifndef __GLITE_LB_ESCAPE_H__
+#define __GLITE_LB_ESCAPE_H__
 /*!
  * \file Client/escape.h
  * \brief Prototypes for Client/escape.c
@@ -57,4 +57,4 @@ char *edg_wll_UnescapeXML(const char *);
 
 char *edg_wll_EscapeSQL(const char *);
 
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_ESCAPE_H__ */
+#endif /* __GLITE_LB_ESCAPE_H__ */

diff --git a/org.glite.lb.common/interface/events.h.T b/org.glite.lb.common/interface/events.h.T
index e04c20d..e3cee7f 100644 (file)
--- a/org.glite.lb.common/interface/events.h.T
+++ b/org.glite.lb.common/interface/events.h.T
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_EVENTS_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_EVENTS_H__
+#ifndef __GLITE_LB_EVENTS_H__
+#define __GLITE_LB_EVENTS_H__
 
 /**
  * \file events.h
@@ -393,4 +393,4 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_EVENTS_H__ */
+#endif /* __GLITE_LB_EVENTS_H__ */

diff --git a/org.glite.lb.common/interface/events_parse.h b/org.glite.lb.common/interface/events_parse.h
index 0f1250d..957dd7e 100644 (file)
--- a/org.glite.lb.common/interface/events_parse.h
+++ b/org.glite.lb.common/interface/events_parse.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_EVENTS_PARSE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_EVENTS_PARSE_H__
+#ifndef __GLITE_LB_EVENTS_PARSE_H__
+#define __GLITE_LB_EVENTS_PARSE_H__
 
 #ident "$Header$"
 
@@ -94,4 +94,4 @@ extern edg_wll_LogLine edg_wll_UnparseNotifEvent(
 #endif
 
 
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_EVENTS_PARSE_H__ */
+#endif /* __GLITE_LB_EVENTS_PARSE_H__ */

diff --git a/org.glite.lb.common/interface/il_msg.h b/org.glite.lb.common/interface/il_msg.h
index c00a7d0..b4aee62 100644 (file)
--- a/org.glite.lb.common/interface/il_msg.h
+++ b/org.glite.lb.common/interface/il_msg.h
@@ -1,5 +1,5 @@
-#ifndef IL_MSG_H
-#define IL_MSG_H
+#ifndef __GLITE_LB_IL_MSG_H__
+#define __GLITE_LB_IL_MSG_H__
 
 #include "il_string.h"
 
@@ -50,4 +50,4 @@ enum {
   LB_TIME  = 900
 };
 
-#endif
+#endif /* __GLITE_LB_IL_MSG_H__ */

diff --git a/org.glite.lb.common/interface/il_string.h b/org.glite.lb.common/interface/il_string.h
index 2a3d479..2d91521 100644 (file)
--- a/org.glite.lb.common/interface/il_string.h
+++ b/org.glite.lb.common/interface/il_string.h
@@ -1,5 +1,5 @@
-#ifndef NET_STRING_H
-#define NET_STRING_H
+#ifndef __GLITE_LB_NET_STRING_H__
+#define __GLITE_LB_NET_STRING_H__
 
 #ident "$Header$"
 
@@ -19,4 +19,4 @@ char *get_string(char *p, il_octet_string_t *s);
 int len_string(il_octet_string_t *s);
 int len_int(int d);
 
-#endif
+#endif /* __GLITE_LB_NET_STRING_H__ */

diff --git a/org.glite.lb.common/interface/jobstat.h.T b/org.glite.lb.common/interface/jobstat.h.T
index fc6375f..ee2fab9 100644 (file)
--- a/org.glite.lb.common/interface/jobstat.h.T
+++ b/org.glite.lb.common/interface/jobstat.h.T
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTAT_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTAT_H__
+#ifndef __GLITE_LB_JOBSTAT_H__
+#define __GLITE_LB_JOBSTAT_H__
 
 /*!
  * \file jobstat.h  
@@ -166,4 +166,4 @@ extern char *edg_wll_StatToString(edg_wll_JobStatCode);
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTAT_H__ */
+#endif /* __GLITE_LB_JOBSTAT_H__ */

diff --git a/org.glite.lb.common/interface/lb_maildir.h b/org.glite.lb.common/interface/lb_maildir.h
index 50eb8d4..0f599e8 100644 (file)
--- a/org.glite.lb.common/interface/lb_maildir.h
+++ b/org.glite.lb.common/interface/lb_maildir.h
@@ -1,5 +1,5 @@
-#ifndef LB_MAILDIR
-#define LB_MAILDIR
+#ifndef __GLITE_LB_MAILDIR_H__
+#define __GLITE_LB_MAILDIR_H__
 
 /*
  * Functions for reading and writing messages via
@@ -21,4 +21,4 @@ extern int edg_wll_MaildirRetryTransStart(const char *, time_t, time_t, char **,
 extern int edg_wll_MaildirTransStart(const char *, char **, char **);
 extern int edg_wll_MaildirTransEnd(const char *, char *, int);
 
-#endif
+#endif /* __GLITE_LB_MAILDIR_H__ */

diff --git a/org.glite.lb.common/interface/lb_perftest.h b/org.glite.lb.common/interface/lb_perftest.h
index 9a14090..77cc627 100644 (file)
--- a/org.glite.lb.common/interface/lb_perftest.h
+++ b/org.glite.lb.common/interface/lb_perftest.h
@@ -1,5 +1,5 @@
-#ifndef LB_PERFTEST_H
-#define LB_PERFTEST_H
+#ifndef __GLITE_LB_PERFTEST_H__
+#define __GLITE_LB_PERFTEST_H__ 
 
 #ident "$Header$"
 
@@ -40,4 +40,4 @@ glite_wll_perftest_createJobId(const char *bkserver,
                               int job_num,
                               edg_wlc_JobId *jobid);
 
-#endif
+#endif /* __GLITE_LB_PERFTEST_H__ */

diff --git a/org.glite.lb.common/interface/lb_plain_io.h b/org.glite.lb.common/interface/lb_plain_io.h
index d423bbc..3b9bad8 100644 (file)
--- a/org.glite.lb.common/interface/lb_plain_io.h
+++ b/org.glite.lb.common/interface/lb_plain_io.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_LB_PLAIN_IO_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_LB_PLAIN_IO_H__
+#ifndef __GLITE_LB_PLAIN_IO_H__
+#define __GLITE_LB_PLAIN_IO_H__
 
 
 #ifdef __cplusplus
@@ -43,4 +43,4 @@ int edg_wll_plain_write_full(
 } 
 #endif
        
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_LB_PLAIN_IO_H__ */
+#endif /* __GLITE_LB_PLAIN_IO_H__ */

diff --git a/org.glite.lb.common/interface/log_proto.h b/org.glite.lb.common/interface/log_proto.h
index 4f0329e..d2a3889 100644 (file)
--- a/org.glite.lb.common/interface/log_proto.h
+++ b/org.glite.lb.common/interface/log_proto.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_LOG_PROTO_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_LOG_PROTO_H__
+#ifndef __GLITE_LB_LOG_PROTO_H__
+#define __GLITE_LB_LOG_PROTO_H__
 
 #ident "$Header$"
 
@@ -90,4 +90,4 @@ edg_wll_log_event_send(
        struct timeval     *timeout);
 
 
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_LOG_PROTO_H__ */
+#endif /* __GLITE_LB_LOG_PROTO_H__ */

diff --git a/org.glite.lb.common/interface/mini_http.h b/org.glite.lb.common/interface/mini_http.h
index 5607f3f..f57b377 100644 (file)
--- a/org.glite.lb.common/interface/mini_http.h
+++ b/org.glite.lb.common/interface/mini_http.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_MINI_HTTP_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_MINI_HTTP_H__
+#ifndef __GLITE_LB_MINI_HTTP_H__
+#define __GLITE_LB_MINI_HTTP_H__
 
 #ident "$Header$"
 
@@ -60,4 +60,4 @@ extern edg_wll_ErrorCode edg_wll_http_send_proxy(
        const char *            /* IN: message body */
 );
 
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_MINI_HTTP_H__ */
+#endif /* __GLITE_LB_MINI_HTTP_H__ */

diff --git a/org.glite.lb.common/interface/notifid.h b/org.glite.lb.common/interface/notifid.h
index 1a78c1b..7ec644e 100644 (file)
--- a/org.glite.lb.common/interface/notifid.h
+++ b/org.glite.lb.common/interface/notifid.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_NOTIFID_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_NOTIFID_H__
+#ifndef __GLITE_LB_NOTIFID_H__
+#define __GLITE_LB_NOTIFID_H__
 
 #ident "$Header$"
 
@@ -92,4 +92,5 @@ edg_wll_NotifId *edg_wll_NotifIdDup(const edg_wll_NotifId src);
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __GLITE_LB_NOTIFID_H__ */

diff --git a/org.glite.lb.common/interface/query_rec.h b/org.glite.lb.common/interface/query_rec.h
index 287f320..8125a3c 100644 (file)
--- a/org.glite.lb.common/interface/query_rec.h
+++ b/org.glite.lb.common/interface/query_rec.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__
+#ifndef __GLITE_LB_QUERY_REC_H__
+#define __GLITE_LB_QUERY_REC_H__
 
 /*!
  * \file consumer.h
@@ -106,4 +106,4 @@ void edg_wll_QueryRecFree(edg_wll_QueryRec *);
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__ */
+#endif /* __GLITE_LB_QUERY_REC_H__ */

diff --git a/org.glite.lb.common/interface/timeouts.h b/org.glite.lb.common/interface/timeouts.h
index eb075f2..8ab65fc 100644 (file)
--- a/org.glite.lb.common/interface/timeouts.h
+++ b/org.glite.lb.common/interface/timeouts.h
@@ -1,3 +1,6 @@
+#ifndef __GLITE_LB_TIMEOUTS_H__
+#define __GLITE_LB_TIMEOUTS_H__
+
 /** 
  * default and maximal notif timeout (in seconds)
  */
@@ -18,3 +21,4 @@
 #define EDG_WLL_LOG_SYNC_TIMEOUT_DEFAULT       120
 #define EDG_WLL_LOG_SYNC_TIMEOUT_MAX           600
 
+#endif /* __GLITE_LB_TIMEOUTS_H__ */

diff --git a/org.glite.lb.common/interface/ulm_parse.h b/org.glite.lb.common/interface/ulm_parse.h
index ee7d85c..945378e 100644 (file)
--- a/org.glite.lb.common/interface/ulm_parse.h
+++ b/org.glite.lb.common/interface/ulm_parse.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_ULM_PARSE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_ULM_PARSE_H__
+#ifndef __GLITE_LB_ULM_PARSE_H__
+#define __GLITE_LB_ULM_PARSE_H__
 
 #ident "$Header$"
 
@@ -44,4 +44,4 @@ extern double         edg_wll_ULMDateToDouble( const char *s );
 void           edg_wll_ULMDateToTimeval( const char *s, struct timeval *tv );
 extern int     edg_wll_ULMTimevalToDate( long sec, long usec, char *dstr );
 
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_ULM_PARSE_H__ */
+#endif /* __GLITE_LB_ULM_PARSE_H__ */

diff --git a/org.glite.lb.common/interface/xml_conversions.h b/org.glite.lb.common/interface/xml_conversions.h
index 2c261c1..a542d67 100644 (file)
--- a/org.glite.lb.common/interface/xml_conversions.h
+++ b/org.glite.lb.common/interface/xml_conversions.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_XML_CONVERSIONS_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_XML_CONVERSIONS_H__
+#ifndef __GLITE_LB_XML_CONVERSIONS_H__
+#define __GLITE_LB_XML_CONVERSIONS_H__
 
 #ident "$Header$"
 
@@ -154,4 +154,4 @@ char *edg_wll_NotifChangeOpToString(edg_wll_NotifChangeOp notifChangeOpConst);
 } // extern "C"
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_XML_CONVERSIONS_H__ */
+#endif /* __GLITE_LB_XML_CONVERSIONS_H__ */

diff --git a/org.glite.lb.common/interface/xml_parse.h b/org.glite.lb.common/interface/xml_parse.h
index 837600d..259ad54 100644 (file)
--- a/org.glite.lb.common/interface/xml_parse.h
+++ b/org.glite.lb.common/interface/xml_parse.h
@@ -1,5 +1,5 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_XML_PARSE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_XML_PARSE_H__
+#ifndef __GLITE_LB_XML_PARSE_H__
+#define __GLITE_LB_XML_PARSE_H__
 
 #ident "$Header$"
 
@@ -79,4 +79,4 @@ extern int edg_wll_QuerySequenceCodeToXML(edg_wll_Context ctx, edg_wlc_JobId job
 }
 #endif
 
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_XML_PARSE_H__ */
+#endif /* __GLITE_LB_XML_PARSE_H__ */