Make libglabels include guards more unique

Renamed libglabels include guards to be more unique.  For example, the include
guard for xml.h was renamed from __XML_H__ to __LGL_XML_H__, which is less
likely to collide with other similarly named macros.

diff --git a/libglabels/category.h b/libglabels/category.h
index 3c19bf2edca2ee2e576e14fb2d12ef5d910ef653..b62b906554cb325da322314426d315d0ade31168 100644 (file)
--- a/libglabels/category.h
+++ b/libglabels/category.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CATEGORY_H__
-#define __CATEGORY_H__
+#ifndef __LGL_CATEGORY_H__
+#define __LGL_CATEGORY_H__
 
 #include <glib.h>
 
@@ -48,7 +48,7 @@ void              lgl_category_free                (lglCategory       *category)
 
 G_END_DECLS
 
-#endif
+#endif /* __LGL_CATEGORY_H__ */
 
 
 

diff --git a/libglabels/db.h b/libglabels/db.h
index 96367c1d8484d0b24cc5c8266aeed3420d95b0cd..465929fbc419cb594ba3d28dca5b6ad6fa270fa8 100644 (file)
--- a/libglabels/db.h
+++ b/libglabels/db.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DB_H__
-#define __DB_H__
+#ifndef __LGL_DB_H__
+#define __LGL_DB_H__
 
 #include <glib.h>
 
@@ -137,7 +137,7 @@ void           lgl_db_print_aliases                  (const lglTemplate    *temp
 
 G_END_DECLS
 
-#endif
+#endif /* __LGL_DB_H__ */
 
 
 

diff --git a/libglabels/paper.h b/libglabels/paper.h
index 0cf918f2159db96480a518d83758a807d20b4eb3..46a7a64d09956bb2446d5e761e0dacc9754d8221 100644 (file)
--- a/libglabels/paper.h
+++ b/libglabels/paper.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PAPER_H__
-#define __PAPER_H__
+#ifndef __LGL_PAPER_H__
+#define __LGL_PAPER_H__
 
 #include <glib.h>
 
@@ -56,7 +56,7 @@ void                 lgl_paper_free                (lglPaper         *paper);
 
 G_END_DECLS
 
-#endif
+#endif /* __LGL_PAPER_H__ */
 
 
 

diff --git a/libglabels/str.h b/libglabels/str.h
index 54e2361a9f8de7eb3a52ef461d409983e4a42362..a3ace6f974c950ed42262e3d323cd5cb819c3837 100644 (file)
--- a/libglabels/str.h
+++ b/libglabels/str.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __STR_H__
-#define __STR_H__
+#ifndef __LGL_STR_H__
+#define __LGL_STR_H__
 
 #include <glib.h>
 
@@ -31,7 +31,7 @@ gint  lgl_str_utf8_casecmp (const gchar *s1,
 G_END_DECLS
 
 
-#endif /* __STR_H__ */
+#endif /* __LGL_STR_H__ */
 
 
 

diff --git a/libglabels/template.h b/libglabels/template.h
index ca53ab1b9a192a7e442f6f04f71c9c484557c5b7..f8e5383c68b68d01815b4a3f20d6ac9314e9cc16 100644 (file)
--- a/libglabels/template.h
+++ b/libglabels/template.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __TEMPLATE_H__
-#define __TEMPLATE_H__
+#ifndef __LGL_TEMPLATE_H__
+#define __LGL_TEMPLATE_H__
 
 #include <glib.h>
 
@@ -369,7 +369,7 @@ void                 lgl_template_markup_free          (lglTemplateMarkup
 
 G_END_DECLS
 
-#endif
+#endif /* __LGL_TEMPLATE_H__ */
 
 
 

diff --git a/libglabels/xml-category.h b/libglabels/xml-category.h
index 815acf96654ffd07cd0815f9a558196f71bec9d4..acfc5a538d7319d69dc4a14db860389edce7c498 100644 (file)
--- a/libglabels/xml-category.h
+++ b/libglabels/xml-category.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __XML_CATEGORY_H__
-#define __XML_CATEGORY_H__
+#ifndef __LGL_XML_CATEGORY_H__
+#define __LGL_XML_CATEGORY_H__
 
 #include <glib.h>
 #include <libxml/tree.h>
@@ -37,7 +37,7 @@ lglCategory *lgl_xml_category_parse_category_node       (xmlNodePtr    category_
 
 G_END_DECLS
 
-#endif /* __XML_CATEGORY_H__ */
+#endif /* __LGL_XML_CATEGORY_H__ */
 
 
 

diff --git a/libglabels/xml-paper.h b/libglabels/xml-paper.h
index bffda36f928b92c599112606a9c7bef9715631b7..71c30878c191fc8bc23729b1e38205e1582f03dd 100644 (file)
--- a/libglabels/xml-paper.h
+++ b/libglabels/xml-paper.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __XML_PAPER_H__
-#define __XML_PAPER_H__
+#ifndef __LGL_XML_PAPER_H__
+#define __LGL_XML_PAPER_H__
 
 #include <glib.h>
 #include <libxml/tree.h>
@@ -37,7 +37,7 @@ lglPaper    *lgl_xml_paper_parse_paper_node      (xmlNodePtr    paper_node);
 
 G_END_DECLS
 
-#endif /* __XML_PAPER_H__ */
+#endif /* __LGL_XML_PAPER_H__ */
 
 
 

diff --git a/libglabels/xml-template.h b/libglabels/xml-template.h
index e44600707b939b166cfeb100694cf7007e02ac2e..205faa7a15496b750fba2467d13b7f9d4295b4fd 100644 (file)
--- a/libglabels/xml-template.h
+++ b/libglabels/xml-template.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __XML_TEMPLATE_H__
-#define __XML_TEMPLATE_H__
+#ifndef __LGL_XML_TEMPLATE_H__
+#define __LGL_XML_TEMPLATE_H__
 
 #include <glib.h>
 #include <libxml/tree.h>
@@ -47,7 +47,7 @@ void         lgl_xml_template_create_template_node     (const lglTemplate *templ
 
 G_END_DECLS
 
-#endif /* __XML_TEMPLATE_H__ */
+#endif /* __LGL_XML_TEMPLATE_H__ */
 
 
 

diff --git a/libglabels/xml.h b/libglabels/xml.h
index 7b49c8fc530b382616ff5edf1c3b27195cdb0ff4..4629cfe0941cd2f41c7cb83827584fff013c8ce3 100644 (file)
--- a/libglabels/xml.h
+++ b/libglabels/xml.h
@@ -18,8 +18,8 @@
  *  along with libglabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __XML_H__
-#define __XML_H__
+#ifndef __LGL_XML_H__
+#define __LGL_XML_H__
 
 #include <glib.h>
 #include <libxml/tree.h>
@@ -105,7 +105,7 @@ void     lgl_xml_set_default_units (lglUnits      units);
 G_END_DECLS
 
 
-#endif /* __XML_H__ */
+#endif /* __LGL_XML_H__ */