[Olsr-commit] OLSR.org main repository branch, stable, updated. OLSRD_0_6_2-412-gdc1a2ed

[(spam-protected)]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OLSR.org main repository".

        See http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=OLSRD_0_6_2-412-gdc1a2ed
        for a web version of the last commit.

The branch, stable has been updated
       via  dc1a2edd03f90e7bee8385241371544c3ad3bdab (commit)
       via  a1b91310df28198e6aa6213c5cc661d13fa388bf (commit)
       via  ceb54febc2bf34f09254d06bdf9073fbbc3ac341 (commit)
       via  7a791e7a1e3644ba41fa8c51d865f750affe71d2 (commit)
       via  8682557ef02c00cc887bac7ee6fc62a690a86917 (commit)
      from  7076dff03e76990aa7374da04ad7ae355d9e4503 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc1a2edd03f90e7bee8385241371544c3ad3bdab
Author: Ferry Huberts <(spam-protected)>
Date:   Thu May 31 13:02:41 2012 +0200

    sgw: update gw_def_finished_ipv{4,6} determination
    
    ...to be inline with their comments
    
    They did read strange. Now they're the same as the comments,
    with the ! implementing the semantics of 'finished'.
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

commit a1b91310df28198e6aa6213c5cc661d13fa388bf
Author: Ferry Huberts <(spam-protected)>
Date:   Thu May 31 14:34:37 2012 +0200

    linux: net: fix some typos
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

commit ceb54febc2bf34f09254d06bdf9073fbbc3ac341
Author: Ferry Huberts <(spam-protected)>
Date:   Wed May 30 15:42:26 2012 +0200

    olsr_switch: add -DNO_OLDNAMES to CFLAGS
    
    To make mingw cross compilation on Fedora 17 work.
    
    [CC] ohs_cmd.c
    In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/sys/stat.h:14:0,
                     from ohs_cmd.c:54:
    /usr/i686-w64-mingw32/sys-root/mingw/include/io.h:313:15: error: conflicting types for 'closesocket'
    In file included from ../../src/olsr_types.h:90:0,
                     from olsr_host_switch.h:45,
                     from ohs_cmd.c:42:
    /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:998:34: note: previous declaration of 'closesocket' was here
    make: *** [ohs_cmd.o] Error 1
    make: *** [switch] Error 2
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

commit 7a791e7a1e3644ba41fa8c51d865f750affe71d2
Author: Ferry Huberts <(spam-protected)>
Date:   Wed May 30 15:47:22 2012 +0200

    win32: only declare struct timespec when needed
    
    To make mingw cross compilation on Fedora 17 work.
    
    [CC] src/common/autobuf.c
    In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/time.h:277:0,
                     from src/defs.h:54,
                     from src/common/autobuf.h:47,
                     from src/common/autobuf.c:42:
    /usr/i686-w64-mingw32/sys-root/mingw/include/sys/timeb.h:90:8: error: redefinition of 'struct timespec'
    In file included from src/defs.h:46:0,
                     from src/common/autobuf.h:47,
                     from src/common/autobuf.c:42:
    ./src/win32/sys/time.h:82:8: note: originally defined here
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

commit 8682557ef02c00cc887bac7ee6fc62a690a86917
Author: Ferry Huberts <(spam-protected)>
Date:   Wed May 30 15:46:06 2012 +0200

    defs: only define ARRAYSIZE when needed
    
    To make mingw cross compilation on Fedora 17 work.
    
    In file included from src/common/autobuf.h:47:0,
                     from src/common/autobuf.c:42:
    src/defs.h:103:0: error: "ARRAYSIZE" redefined [-Werror]
    In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windef.h:137:0,
                     from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:69,
                     from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23,
                     from ./src/win32/sys/time.h:47,
                     from src/defs.h:46,
                     from src/common/autobuf.h:47,
                     from src/common/autobuf.c:42:
    /usr/i686-w64-mingw32/sys-root/mingw/include/winnt.h:483:0: note: this is the location of the previous definition
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

-----------------------------------------------------------------------

Summary of changes:
 src/defs.h                    |    2 ++
 src/gateway_default_handler.c |    8 ++++----
 src/linux/net.c               |    8 ++++----
 src/olsr_switch/Makefile      |    2 +-
 src/win32/sys/time.h          |    4 ++++
 5 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
OLSR.org main repository