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

Ferry Huberts (spam-protected)
Wed Jul 25 08:46:36 CEST 2012



On 25-07-12 08:42, Henning Rogge wrote:
> 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 */

ok, will update the patch for it


-- 
Ferry Huberts




More information about the Olsr-dev mailing list