[gspell] Do not prefix macro names with underscores



commit 94fe29d846be946234288fd082117d9084ce8317
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Apr 28 17:59:22 2016 +0200

    Do not prefix macro names with underscores
    
    Symbols (even preprocessor macro names) that begin with an underscore are
    reserved for the use of the compiler.

 gspell/gspell-checker-dialog.h             |    8 ++++----
 gspell/gspell-checker.h                    |    8 ++++----
 gspell/gspell-init.h                       |    6 +++---
 gspell/gspell-inline-checker-text-buffer.h |    6 +++---
 gspell/gspell-language-chooser-button.h    |    8 ++++----
 gspell/gspell-language-chooser-dialog.h    |    8 ++++----
 gspell/gspell-language-chooser.h           |    8 ++++----
 gspell/gspell-language.h                   |    8 ++++----
 gspell/gspell-navigator-text-view.h        |    8 ++++----
 gspell/gspell-navigator.h                  |    8 ++++----
 gspell/gspell-text-buffer.h                |    8 ++++----
 gspell/gspell-text-iter.h                  |    6 +++---
 gspell/gspell-text-view.h                  |    8 ++++----
 gspell/gspell-utils.h                      |    6 +++---
 gspell/gspell.h                            |   10 +++++-----
 15 files changed, 57 insertions(+), 57 deletions(-)
---
diff --git a/gspell/gspell-checker-dialog.h b/gspell/gspell-checker-dialog.h
index 92e1480..45d66ad 100644
--- a/gspell/gspell-checker-dialog.h
+++ b/gspell/gspell-checker-dialog.h
@@ -18,10 +18,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_CHECKER_DIALOG_H__
-#define __GSPELL_CHECKER_DIALOG_H__
+#ifndef GSPELL_CHECKER_DIALOG_H
+#define GSPELL_CHECKER_DIALOG_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -50,6 +50,6 @@ GspellNavigator *     gspell_checker_dialog_get_spell_navigator       (GspellCheckerDialog
 
 G_END_DECLS
 
-#endif  /* __GSPELL_CHECKER_DIALOG_H__ */
+#endif  /* GSPELL_CHECKER_DIALOG_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-checker.h b/gspell/gspell-checker.h
index 8518591..9fee9fa 100644
--- a/gspell/gspell-checker.h
+++ b/gspell/gspell-checker.h
@@ -18,10 +18,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_CHECKER_H__
-#define __GSPELL_CHECKER_H__
+#ifndef GSPELL_CHECKER_H
+#define GSPELL_CHECKER_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -112,6 +112,6 @@ void                gspell_checker_set_correction           (GspellChecker *checker,
 
 G_END_DECLS
 
-#endif  /* __GSPELL_CHECKER_H__ */
+#endif  /* GSPELL_CHECKER_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-init.h b/gspell/gspell-init.h
index 44a5fb5..e93c00b 100644
--- a/gspell/gspell-init.h
+++ b/gspell/gspell-init.h
@@ -18,8 +18,8 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_INIT_H__
-#define __GSPELL_INIT_H__
+#ifndef GSPELL_INIT_H
+#define GSPELL_INIT_H
 
 #include <glib.h>
 
@@ -32,6 +32,6 @@ HMODULE _gspell_init_get_dll (void);
 
 #endif /* G_OS_WIN32 */
 
-#endif /* __GSPELL_INIT_H__ */
+#endif /* GSPELL_INIT_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-inline-checker-text-buffer.h b/gspell/gspell-inline-checker-text-buffer.h
index 967ae6a..10063a6 100644
--- a/gspell/gspell-inline-checker-text-buffer.h
+++ b/gspell/gspell-inline-checker-text-buffer.h
@@ -22,8 +22,8 @@
  * Copyright 2002 - Evan Martin
  */
 
-#ifndef __GSPELL_INLINE_CHECKER_TEXT_BUFFER_H__
-#define __GSPELL_INLINE_CHECKER_TEXT_BUFFER_H__
+#ifndef GSPELL_INLINE_CHECKER_TEXT_BUFFER_H
+#define GSPELL_INLINE_CHECKER_TEXT_BUFFER_H
 
 #include <gtk/gtk.h>
 
@@ -60,6 +60,6 @@ GtkTextTag *
 
 G_END_DECLS
 
-#endif  /* __GSPELL_INLINE_CHECKER_TEXT_BUFFER_H__ */
+#endif  /* GSPELL_INLINE_CHECKER_TEXT_BUFFER_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-language-chooser-button.h b/gspell/gspell-language-chooser-button.h
index 3ade91e..1d97753 100644
--- a/gspell/gspell-language-chooser-button.h
+++ b/gspell/gspell-language-chooser-button.h
@@ -17,10 +17,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_LANGUAGE_CHOOSER_BUTTON_H__
-#define __GSPELL_LANGUAGE_CHOOSER_BUTTON_H__
+#ifndef GSPELL_LANGUAGE_CHOOSER_BUTTON_H
+#define GSPELL_LANGUAGE_CHOOSER_BUTTON_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -46,6 +46,6 @@ GtkWidget *   gspell_language_chooser_button_new      (const GspellLanguage *current_la
 
 G_END_DECLS
 
-#endif /* __GSPELL_LANGUAGE_CHOOSER_BUTTON_H__ */
+#endif /* GSPELL_LANGUAGE_CHOOSER_BUTTON_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-language-chooser-dialog.h b/gspell/gspell-language-chooser-dialog.h
index 4dff073..24c5dda 100644
--- a/gspell/gspell-language-chooser-dialog.h
+++ b/gspell/gspell-language-chooser-dialog.h
@@ -18,10 +18,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_LANGUAGE_CHOOSER_DIALOG_H__
-#define __GSPELL_LANGUAGE_CHOOSER_DIALOG_H__
+#ifndef GSPELL_LANGUAGE_CHOOSER_DIALOG_H
+#define GSPELL_LANGUAGE_CHOOSER_DIALOG_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -49,6 +49,6 @@ GtkWidget *   gspell_language_chooser_dialog_new              (GtkWindow            *parent,
 
 G_END_DECLS
 
-#endif  /* __GSPELL_LANGUAGE_CHOOSER_DIALOG_H__ */
+#endif  /* GSPELL_LANGUAGE_CHOOSER_DIALOG_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-language-chooser.h b/gspell/gspell-language-chooser.h
index 3418d39..53a33e8 100644
--- a/gspell/gspell-language-chooser.h
+++ b/gspell/gspell-language-chooser.h
@@ -17,10 +17,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_LANGUAGE_CHOOSER_H__
-#define __GSPELL_LANGUAGE_CHOOSER_H__
+#ifndef GSPELL_LANGUAGE_CHOOSER_H
+#define GSPELL_LANGUAGE_CHOOSER_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -60,6 +60,6 @@ void                  gspell_language_chooser_set_language_code       
(GspellLanguageChooser *chooser
 
 G_END_DECLS
 
-#endif /* __GSPELL_LANGUAGE_CHOOSER_H__ */
+#endif /* GSPELL_LANGUAGE_CHOOSER_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-language.h b/gspell/gspell-language.h
index 076c929..83c8f69 100644
--- a/gspell/gspell-language.h
+++ b/gspell/gspell-language.h
@@ -24,10 +24,10 @@
  * partly on Epiphany's code.
  */
 
-#ifndef __GSPELL_LANGUAGE_H__
-#define __GSPELL_LANGUAGE_H__
+#ifndef GSPELL_LANGUAGE_H
+#define GSPELL_LANGUAGE_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -62,6 +62,6 @@ void          gspell_language_free                    (GspellLanguage *language);
 
 G_END_DECLS
 
-#endif /* __GSPELL_LANGUAGE_H__ */
+#endif /* GSPELL_LANGUAGE_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-navigator-text-view.h b/gspell/gspell-navigator-text-view.h
index e6bc8e6..c903983 100644
--- a/gspell/gspell-navigator-text-view.h
+++ b/gspell/gspell-navigator-text-view.h
@@ -17,10 +17,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_NAVIGATOR_TEXT_VIEW_H__
-#define __GSPELL_NAVIGATOR_TEXT_VIEW_H__
+#ifndef GSPELL_NAVIGATOR_TEXT_VIEW_H
+#define GSPELL_NAVIGATOR_TEXT_VIEW_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -49,6 +49,6 @@ GtkTextView *         gspell_navigator_text_view_get_view     (GspellNavigatorTextView *nav
 
 G_END_DECLS
 
-#endif /* __GSPELL_NAVIGATOR_TEXT_VIEW_H__ */
+#endif /* GSPELL_NAVIGATOR_TEXT_VIEW_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-navigator.h b/gspell/gspell-navigator.h
index e03106d..9a69877 100644
--- a/gspell/gspell-navigator.h
+++ b/gspell/gspell-navigator.h
@@ -17,10 +17,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_NAVIGATOR_H__
-#define __GSPELL_NAVIGATOR_H__
+#ifndef GSPELL_NAVIGATOR_H
+#define GSPELL_NAVIGATOR_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -67,6 +67,6 @@ void          gspell_navigator_change_all     (GspellNavigator *navigator,
 
 G_END_DECLS
 
-#endif /* __GSPELL_NAVIGATOR_H__ */
+#endif /* GSPELL_NAVIGATOR_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-text-buffer.h b/gspell/gspell-text-buffer.h
index b42606f..bdc8103 100644
--- a/gspell/gspell-text-buffer.h
+++ b/gspell/gspell-text-buffer.h
@@ -17,10 +17,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_TEXT_BUFFER_H__
-#define __GSPELL_TEXT_BUFFER_H__
+#ifndef GSPELL_TEXT_BUFFER_H
+#define GSPELL_TEXT_BUFFER_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -45,6 +45,6 @@ void                  gspell_text_buffer_set_spell_checker            (GspellTextBuffer 
*gspell_buffer,
 
 G_END_DECLS
 
-#endif /* __GSPELL_TEXT_BUFFER_H__ */
+#endif /* GSPELL_TEXT_BUFFER_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-text-iter.h b/gspell/gspell-text-iter.h
index b344d43..5f332aa 100644
--- a/gspell/gspell-text-iter.h
+++ b/gspell/gspell-text-iter.h
@@ -17,8 +17,8 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_TEXT_ITER_H__
-#define __GSPELL_TEXT_ITER_H__
+#ifndef GSPELL_TEXT_ITER_H
+#define GSPELL_TEXT_ITER_H
 
 #include <gtk/gtk.h>
 
@@ -41,6 +41,6 @@ gboolean      _gspell_text_iter_inside_word           (const GtkTextIter *iter);
 
 G_END_DECLS
 
-#endif /* __GSPELL_TEXT_ITER_H__ */
+#endif /* GSPELL_TEXT_ITER_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-text-view.h b/gspell/gspell-text-view.h
index f178c88..b11e554 100644
--- a/gspell/gspell-text-view.h
+++ b/gspell/gspell-text-view.h
@@ -17,10 +17,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_TEXT_VIEW_H__
-#define __GSPELL_TEXT_VIEW_H__
+#ifndef GSPELL_TEXT_VIEW_H
+#define GSPELL_TEXT_VIEW_H
 
-#if !defined (__GSPELL_H_INSIDE__) && !defined (GSPELL_COMPILATION)
+#if !defined (GSPELL_H_INSIDE) && !defined (GSPELL_COMPILATION)
 #error "Only <gspell/gspell.h> can be included directly."
 #endif
 
@@ -52,6 +52,6 @@ void                  gspell_text_view_set_inline_spell_checking      (GspellTextView 
*gspell_view,
 
 G_END_DECLS
 
-#endif /* __GSPELL_TEXT_VIEW_H__ */
+#endif /* GSPELL_TEXT_VIEW_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell-utils.h b/gspell/gspell-utils.h
index e0cd18b..c6eba82 100644
--- a/gspell/gspell-utils.h
+++ b/gspell/gspell-utils.h
@@ -18,8 +18,8 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_UTILS_H__
-#define __GSPELL_UTILS_H__
+#ifndef GSPELL_UTILS_H
+#define GSPELL_UTILS_H
 
 #include <gtk/gtk.h>
 
@@ -53,6 +53,6 @@ gboolean      _gspell_utils_str_to_ascii_apostrophe   (const gchar  *word,
 
 G_END_DECLS
 
-#endif /* __GSPELL_UTILS_H__ */
+#endif /* GSPELL_UTILS_H */
 
 /* ex:set ts=8 noet: */
diff --git a/gspell/gspell.h b/gspell/gspell.h
index 24135ab..ac1c39d 100644
--- a/gspell/gspell.h
+++ b/gspell/gspell.h
@@ -17,10 +17,10 @@
  * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GSPELL_H__
-#define __GSPELL_H__
+#ifndef GSPELL_H
+#define GSPELL_H
 
-#define __GSPELL_H_INSIDE__
+#define GSPELL_H_INSIDE
 
 #include <gspell/gspell-checker.h>
 #include <gspell/gspell-checker-dialog.h>
@@ -33,8 +33,8 @@
 #include <gspell/gspell-text-buffer.h>
 #include <gspell/gspell-text-view.h>
 
-#undef __GSPELL_H_INSIDE__
+#undef GSPELL_H_INSIDE
 
-#endif /* __GSPELL_H__ */
+#endif /* GSPELL_H */
 
 /* ex:set ts=8 noet: */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]