From: Sascha Hauer <s.hauer@pengutronix.de>
To: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] stringlist: fix cpp macro in header
Date: Wed, 9 Jan 2013 09:43:13 +0100 [thread overview]
Message-ID: <20130109084313.GQ1906@pengutronix.de> (raw)
In-Reply-To: <1357658023-31893-1-git-send-email-s.trumtrar@pengutronix.de>
On Tue, Jan 08, 2013 at 04:13:43PM +0100, Steffen Trumtrar wrote:
> Both include/string.h and include/stringlist.h define the c preprocessor macro
> __STRING_H. This leads to a compile time error, in case both files are
> (indirectly) included.
>
> Rename the macro to __STRINGLIST_H in stringlist.h.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Applied, thanks
Sascha
> ---
> include/stringlist.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/stringlist.h b/include/stringlist.h
> index dd3f623..8738137 100644
> --- a/include/stringlist.h
> +++ b/include/stringlist.h
> @@ -1,5 +1,5 @@
> -#ifndef __STRING_H
> -#define __STRING_H
> +#ifndef __STRINGLIST_H
> +#define __STRINGLIST_H
>
> #include <linux/list.h>
>
> @@ -29,4 +29,4 @@ static inline void string_list_free(struct string_list *sl)
> }
> }
>
> -#endif /* __STRING_H */
> +#endif /* __STRINGLIST_H */
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2013-01-09 8:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-08 15:13 Steffen Trumtrar
2013-01-09 8:43 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130109084313.GQ1906@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=s.trumtrar@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox