[PATCH] generic_or1k: Fix include guard conflict at bsp.h

Gedare Bloom gedare at rtems.org
Mon Mar 7 02:07:49 UTC 2016


On Sun, Mar 6, 2016 at 8:30 AM, Hesham Almatary
<heshamelmatary at gmail.com> wrote:
> ---
>  c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h b/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h
> index 72bb107..0a82058 100644
> --- a/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h
> +++ b/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h
> @@ -7,15 +7,15 @@
>   */
>
>  /*
> - * COPYRIGHT (c) 2014-2015 Hesham ALMatary <heshamelmatary at gmail.com>
> + * COPYRIGHT (c) 2014-2016 Hesham ALMatary <heshamelmatary at gmail.com>
>   *
>   * The license and distribution terms for this file may be
>   * found in the file LICENSE in this distribution or at
>   *  http://www.rtems.org/license/LICENSE
>   */
>
> -#ifndef LIBBSP_GENERIC_OR1K_H
> -#define LIBBSP_GENERIC_OR1K_H
> +#ifndef LIBBSP_OR1K_H
> +#define LIBBSP_OR1K_H
>
I'd use LIBBSP_OR1K_GENERIC_OR1K_BSP_H

embedding most of the path in the guard helps to prevent these kinds
of conflicts.

>  #include <bspopts.h>
>  #include <rtems.h>
> @@ -35,7 +35,7 @@ extern "C" {
>  }
>  #endif /* __cplusplus */
>
> -#endif /* LIBBSP_GENERIC_OR1K_H */
> +#endif /* LIBBSP_OR1K_H */
>
>  /**
>   * @defgroup generic_or1k support
> --
> 1.9.1
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel


More information about the devel mailing list