[Olsr-dev] [olsrd] [PATCH v1 03/29] gateway: shift up the #ifdef linux

[Henning Rogge]

On 07/24/2012 06:08 PM, Ferry Huberts wrote:
> From: Ferry Huberts <(spam-protected)>
>
> Signed-off-by: Ferry Huberts <(spam-protected)>
> ---
>   src/gateway.c                 |    3 ++-
>   src/gateway_default_handler.c |    2 +-
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/gateway.c b/src/gateway.c
> index 74b7d19..f74e04a 100644
> --- a/src/gateway.c
> +++ b/src/gateway.c
> @@ -5,6 +5,8 @@
>    *      Author: henning
>    */
>
> +#ifdef linux
> +
>   #include "common/avl.h"
>   #include "defs.h"
>   #include "ipcalc.h"
> @@ -23,7 +25,6 @@
>   #include <assert.h>
>   #include <net/if.h>
>
> -#ifdef linux
>   struct avl_tree gateway_tree;
>
>   static struct olsr_cookie_info *gw_mem_cookie = NULL;
> diff --git a/src/gateway_default_handler.c b/src/gateway_default_handler.c
> index b3aeae9..5255dcd 100644
> --- a/src/gateway_default_handler.c
> +++ b/src/gateway_default_handler.c
> @@ -4,6 +4,7 @@
>    *  Created on: Jan 29, 2010
>    *      Author: rogge
>    */
> +#ifdef linux
>
>   #include "defs.h"
>   #include "gateway.h"
> @@ -15,7 +16,6 @@
>
>   #include "assert.h"
>
> -#ifdef linux
>   static uint32_t gw_def_nodecount, gw_def_stablecount;
>   static bool gw_def_finished_ipv4, gw_def_finished_ipv6;

Fixing the comments of the #endif (in the last line of both files) to

#endif /* linux */

would be nice too. But could be done in an additional patch.

Henning Rogge

-- 
Diplom-Informatiker Henning Rogge , Fraunhofer-Institut für
Kommunikation, Informationsverarbeitung und Ergonomie FKIE
Kommunikationssysteme (KOM)
Neuenahrer Straße 20, 53343 Wachtberg, Germany
Telefon +49 228 9435-961,   Fax +49 228 9435 685
mailto:(spam-protected) http://www.fkie.fraunhofer.de
GPG: E1C6 0914 490B 3909 D944 F80D 4487 C67C 55EC CFE0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 6169 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.olsr.org/pipermail/olsr-dev/attachments/20120725/27f0f3ee/attachment.bin>