[riot-commits] [RIOT-OS/RIOT] dcebfb: posix/osx: fix type conflict on OSX native

Martine Lenders authmillenon at gmail.com
Thu Mar 22 16:57:41 CET 2018


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: dcebfb11bc5a861c711e58838eec5b0131d020e2
      https://github.com/RIOT-OS/RIOT/commit/dcebfb11bc5a861c711e58838eec5b0131d020e2
  Author: Gaëtan Harter <gaetan.harter at fu-berlin.de>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M sys/posix/include/sys/bytes.h

  Log Message:
  -----------
  posix/osx: fix type conflict on OSX native

In another header file, `socklen_t` is defined to `__darwin_socklen_t` which is
an `uint32_t` and it conflicts.

Preparation to remove NATIVEINCLUDES.


  Commit: b5554bcc1f6aa67b638a1f299434e6565eb86f47
      https://github.com/RIOT-OS/RIOT/commit/b5554bcc1f6aa67b638a1f299434e6565eb86f47
  Author: Gaëtan Harter <gaetan.harter at fu-berlin.de>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M sys/posix/include/sys/socket.h

  Log Message:
  -----------
  posix/osx: fix missing AF_LINK on OSX native

netdev_tap.c uses AF_LINK when compiled on OSX native.

Preparation to remove NATIVEINCLUDES.


  Commit: 93a521c50132e24558e42bc57dcf9c94051f07e3
      https://github.com/RIOT-OS/RIOT/commit/93a521c50132e24558e42bc57dcf9c94051f07e3
  Author: Gaëtan Harter <gaetan.harter at fu-berlin.de>
  Date:   2018-03-20 (Tue, 20 Mar 2018)

  Changed paths:
    M boards/native/Makefile
    M boards/native/Makefile.include
    M boards/native/drivers/Makefile
    M cpu/native/Makefile
    M cpu/native/Makefile.include
    M cpu/native/mtd/Makefile
    M cpu/native/netdev_tap/Makefile
    M cpu/native/socket_zep/Makefile

  Log Message:
  -----------
  native: remove non required NATIVEINCLUDES

Some modules used a 'NATIVEINCLUDES' with different include path and no other
included directories.
It was defining basic 'include' in a different order and not using other things
defined in INCLUDES.
After doing some checks with the given include path and possible conflicting
files, there should be no conflict when using the default one.

* No common headers between all the NATIVEINCLUDES directories
* No common headers files between board/native/include, cpu/native/include and
  other files in the repository (except other boards/cpus of course).


  Commit: 690c36b3cf12e0a90cd16f1eb9bd22980d18b098
      https://github.com/RIOT-OS/RIOT/commit/690c36b3cf12e0a90cd16f1eb9bd22980d18b098
  Author: Martine Lenders <authmillenon at gmail.com>
  Date:   2018-03-22 (Thu, 22 Mar 2018)

  Changed paths:
    M boards/native/Makefile
    M boards/native/Makefile.include
    M boards/native/drivers/Makefile
    M cpu/native/Makefile
    M cpu/native/Makefile.include
    M cpu/native/mtd/Makefile
    M cpu/native/netdev_tap/Makefile
    M cpu/native/socket_zep/Makefile
    M sys/posix/include/sys/bytes.h
    M sys/posix/include/sys/socket.h

  Log Message:
  -----------
  Merge pull request #8652 from cladmi/pr/remove_nativeincludes

native: remove non required NATIVEINCLUDES


Compare: https://github.com/RIOT-OS/RIOT/compare/57c8b654dd3d...690c36b3cf12


More information about the commits mailing list