From 9aa38130b9be6f099b18263cdf8f95cf332f614c Mon Sep 17 00:00:00 2001 From: "Andre Moreira Magalhaes (andrunko)" Date: Fri, 4 Jun 2010 13:29:15 -0300 Subject: plugin API: Removed the prefix/suffix __ from header guards. According to http://gcc.gnu.org/onlinedocs/gcc-2.95.3/cpp_1.html#SEC8 the header guards in non-system header files should be FOO_H not __FOO_H__. The double-underscore is reserved for system headers. --- gabble/capabilities-set.h | 4 ++-- gabble/caps-hash.h | 6 +++--- gabble/connection.h | 4 ++-- gabble/disco-identity.h | 4 ++-- gabble/error.h | 4 ++-- gabble/gabble.h | 4 ++-- gabble/plugin.h | 4 ++-- gabble/sidecar.h | 4 ++-- gabble/types.h | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'gabble') diff --git a/gabble/capabilities-set.h b/gabble/capabilities-set.h index c6fa0872c..e902a1399 100644 --- a/gabble/capabilities-set.h +++ b/gabble/capabilities-set.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_CAPABILITIES_SET_H__ -#define __GABBLE_PLUGINS_CAPABILITIES_SET_H__ +#ifndef GABBLE_PLUGINS_CAPABILITIES_SET_H +#define GABBLE_PLUGINS_CAPABILITIES_SET_H #include diff --git a/gabble/caps-hash.h b/gabble/caps-hash.h index 9d44fd5af..c623478ca 100644 --- a/gabble/caps-hash.h +++ b/gabble/caps-hash.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_CAPS_HASH_H__ -#define __GABBLE_PLUGINS_CAPS_HASH_H__ +#ifndef GABBLE_PLUGINS_CAPS_HASH_H +#define GABBLE_PLUGINS_CAPS_HASH_H #include @@ -31,4 +31,4 @@ gchar *gabble_caps_hash_compute (const GabbleCapabilitySet *cap_set, G_END_DECLS -#endif /* __CAPS_HASH_H__ */ +#endif diff --git a/gabble/connection.h b/gabble/connection.h index 73355aac6..20d4fb256 100644 --- a/gabble/connection.h +++ b/gabble/connection.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_CONNECTION_H__ -#define __GABBLE_PLUGINS_CONNECTION_H__ +#ifndef GABBLE_PLUGINS_CONNECTION_H +#define GABBLE_PLUGINS_CONNECTION_H #include diff --git a/gabble/disco-identity.h b/gabble/disco-identity.h index 84739956d..1ddeedde3 100644 --- a/gabble/disco-identity.h +++ b/gabble/disco-identity.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_DISCO_IDENTITY_H__ -#define __GABBLE_PLUGINS_DISCO_IDENTITY_H__ +#ifndef GABBLE_PLUGINS_DISCO_IDENTITY_H +#define GABBLE_PLUGINS_DISCO_IDENTITY_H #include diff --git a/gabble/error.h b/gabble/error.h index e751768eb..e6a965f75 100644 --- a/gabble/error.h +++ b/gabble/error.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_ERROR_H__ -#define __GABBLE_PLUGINS_ERROR_H__ +#ifndef GABBLE_PLUGINS_ERROR_H +#define GABBLE_PLUGINS_ERROR_H #include diff --git a/gabble/gabble.h b/gabble/gabble.h index 86403218a..41fc93cc0 100644 --- a/gabble/gabble.h +++ b/gabble/gabble.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_GABBLE_H__ -#define __GABBLE_PLUGINS_GABBLE_H__ +#ifndef GABBLE_PLUGINS_GABBLE_H +#define GABBLE_PLUGINS_GABBLE_H #define IN_GABBLE_PLUGINS_GABBLE_H diff --git a/gabble/plugin.h b/gabble/plugin.h index 59ca1fddc..5fc2c3bfc 100644 --- a/gabble/plugin.h +++ b/gabble/plugin.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_PLUGIN_H__ -#define __GABBLE_PLUGINS_PLUGIN_H__ +#ifndef GABBLE_PLUGINS_PLUGIN_H +#define GABBLE_PLUGINS_PLUGIN_H #include #include diff --git a/gabble/sidecar.h b/gabble/sidecar.h index 64c51a743..923c50667 100644 --- a/gabble/sidecar.h +++ b/gabble/sidecar.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_SIDECAR_H__ -#define __GABBLE_PLUGINS_SIDECAR_H__ +#ifndef GABBLE_PLUGINS_SIDECAR_H +#define GABBLE_PLUGINS_SIDECAR_H #include diff --git a/gabble/types.h b/gabble/types.h index bd1b8913f..814189ce1 100644 --- a/gabble/types.h +++ b/gabble/types.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GABBLE_PLUGINS_TYPES_H__ -#define __GABBLE_PLUGINS_TYPES_H__ +#ifndef GABBLE_PLUGINS_TYPES_H +#define GABBLE_PLUGINS_TYPES_H #include -- cgit v1.2.3