[PATCH] stringlist: fix cpp macro in header

[PATCH] stringlist: fix cpp macro in header

[Steffen Trumtrar]

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>
---
 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

Re: [PATCH] stringlist: fix cpp macro in header

[Sascha Hauer]

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