From 19428af40ad4f1c6c5fc947046429bf22ca4a13b Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Mon, 26 Oct 2009 23:45:57 -0400
Subject: [PATCH] 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.
---
 libglabels/category.h     | 6 +++---
 libglabels/db.h           | 6 +++---
 libglabels/paper.h        | 6 +++---
 libglabels/str.h          | 6 +++---
 libglabels/template.h     | 6 +++---
 libglabels/xml-category.h | 6 +++---
 libglabels/xml-paper.h    | 6 +++---
 libglabels/xml-template.h | 6 +++---
 libglabels/xml.h          | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/libglabels/category.h b/libglabels/category.h
index 3c19bf2e..b62b9065 100644
--- 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 96367c1d..465929fb 100644
--- 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 0cf918f2..46a7a64d 100644
--- 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 54e2361a..a3ace6f9 100644
--- 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 ca53ab1b..f8e5383c 100644
--- 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 815acf96..acfc5a53 100644
--- 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 bffda36f..71c30878 100644
--- 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 e4460070..205faa7a 100644
--- 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 7b49c8fc..4629cfe0 100644
--- 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__ */
 
 
 
-- 
2.39.5