Subject: [PATCH] Avoid multiple inclusions of adapter.h

---
src/adapter.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/adapter.h b/src/adapter.h
index 9b4ce10..8812ed8 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -22,6 +22,9 @@
*
*/

+#ifndef __ADAPTER_H__
+#define __ADAPTER_H__
+
#include <bluetooth/bluetooth.h>
#include <dbus/dbus.h>
#include <glib.h>
@@ -183,3 +186,5 @@ struct btd_adapter_ops {
int btd_register_adapter_ops(struct btd_adapter_ops *btd_adapter_ops);
void btd_adapter_cleanup_ops(struct btd_adapter_ops *btd_adapter_ops);
int adapter_ops_setup(void);
+
+#endif /* __ADAPTER_H__ */
--
1.6.3.3



Subject: Re: [PATCH] Avoid multiple inclusions of adapter.h

Hi,

El Monday 17 May 2010 18:06:58 Johan Hedberg escribi?:
> Hi,
>
> On Thu, May 13, 2010, Jose Antonio Santos Cadenas wrote:
> > ---
> >
> > src/adapter.h | 5 +++++
> > 1 files changed, 5 insertions(+), 0 deletions(-)
> >
> > diff --git a/src/adapter.h b/src/adapter.h
> > index 9b4ce10..8812ed8 100644
> > --- a/src/adapter.h
> > +++ b/src/adapter.h
> > @@ -22,6 +22,9 @@
> >
> > *
> > */
> >
> > +#ifndef __ADAPTER_H__
> > +#define __ADAPTER_H__
> > +
> >
> > #include <bluetooth/bluetooth.h>
> > #include <dbus/dbus.h>
> > #include <glib.h>
> >
> > @@ -183,3 +186,5 @@ struct btd_adapter_ops {
> >
> > int btd_register_adapter_ops(struct btd_adapter_ops *btd_adapter_ops);
> > void btd_adapter_cleanup_ops(struct btd_adapter_ops *btd_adapter_ops);
> > int adapter_ops_setup(void);
> >
> > +
> > +#endif /* __ADAPTER_H__ */
>
> Lack of these defines is actually intentional for headsers which aren't
> part of any public library. The intention is to keep the header
> dependencies simple and get errors as soon as there's a circular
> dependency between them.

Thank you for the response. I guess I have to review how I do the include :)

>
> Johan
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth"
> in the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2010-05-17 16:06:58

by Johan Hedberg

[permalink] [raw]
Subject: Re: [PATCH] Avoid multiple inclusions of adapter.h

Hi,

On Thu, May 13, 2010, Jose Antonio Santos Cadenas wrote:
> ---
> src/adapter.h | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/src/adapter.h b/src/adapter.h
> index 9b4ce10..8812ed8 100644
> --- a/src/adapter.h
> +++ b/src/adapter.h
> @@ -22,6 +22,9 @@
> *
> */
>
> +#ifndef __ADAPTER_H__
> +#define __ADAPTER_H__
> +
> #include <bluetooth/bluetooth.h>
> #include <dbus/dbus.h>
> #include <glib.h>
> @@ -183,3 +186,5 @@ struct btd_adapter_ops {
> int btd_register_adapter_ops(struct btd_adapter_ops *btd_adapter_ops);
> void btd_adapter_cleanup_ops(struct btd_adapter_ops *btd_adapter_ops);
> int adapter_ops_setup(void);
> +
> +#endif /* __ADAPTER_H__ */

Lack of these defines is actually intentional for headsers which aren't
part of any public library. The intention is to keep the header
dependencies simple and get errors as soon as there's a circular
dependency between them.

Johan