diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-05-30 12:14:58 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-06-05 12:13:17 +0200 |
| commit | 4acfebcc2020de2376eac55787b0b6f0747ca607 (patch) | |
| tree | 6160a139166be3fd41a2162909cbf79403c4e3fd | |
| parent | b3d0c00e584c5b97b79939ed5a699379a8bcd961 (diff) | |
| download | telepathy-glib-4acfebcc2020de2376eac55787b0b6f0747ca607.tar.gz | |
meta-headers: #define _TP_IN_META_HEADER for future single-include guards
https://bugs.freedesktop.org/show_bug.cgi?id=49384
| -rw-r--r-- | telepathy-glib/telepathy-glib-dbus.h | 10 | ||||
| -rw-r--r-- | telepathy-glib/telepathy-glib.h | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/telepathy-glib/telepathy-glib-dbus.h b/telepathy-glib/telepathy-glib-dbus.h index 7e1645511..622773932 100644 --- a/telepathy-glib/telepathy-glib-dbus.h +++ b/telepathy-glib/telepathy-glib-dbus.h @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef TELEPATHY_GLIB_DBUS_H_INCLUDED -#define TELEPATHY_GLIB_DBUS_H_INCLUDED -#define _TP_IN_META_HEADER +#ifndef __TP_GLIB_DBUS_H__ +#define __TP_GLIB_DBUS_H__ #include <telepathy-glib/telepathy-glib.h> +#define _TP_IN_META_HEADER + /* common */ #include <telepathy-glib/gtypes.h> #include <telepathy-glib/interfaces.h> @@ -68,4 +69,5 @@ #include <telepathy-glib/svc-tls.h> #undef _TP_IN_META_HEADER -#endif + +#endif /* __TP_GLIB_DBUS_H__ */ diff --git a/telepathy-glib/telepathy-glib.h b/telepathy-glib/telepathy-glib.h index a150ad53f..6435c64fe 100644 --- a/telepathy-glib/telepathy-glib.h +++ b/telepathy-glib/telepathy-glib.h @@ -20,7 +20,8 @@ #ifndef __TP_GLIB_H__ #define __TP_GLIB_H__ -#define __TP_IN_GLIB_H__ + +#define _TP_IN_META_HEADER #include <telepathy-glib/enums.h> #include <telepathy-glib/errors.h> @@ -123,5 +124,6 @@ #include <telepathy-glib/svc-generic.h> #include <telepathy-glib/svc-client.h> -#undef __TP_IN_GLIB_H__ +#undef _TP_IN_META_HEADER + #endif /* __TP_GLIB_H__ */ |