Merge pull request #2805 from benpicco/platform_identify

oonf_api: use RIOT_VERSION as platform identifier for RIOT
RIOT-OS · Apr 19, 2015 · 279fd09 · 279fd09
2 parents 4a734d5 + 7a2b705
commit 279fd09
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/pkg/oonf_api/0001-add-RIOT-support.patch b/pkg/oonf_api/0001-add-RIOT-support.patch
@@ -84,7 +84,7 @@ index 77c519b..e09c0c9 100644
  #include <winsock2.h>
  #endif
 
-+#ifdef RIOT
++#ifdef RIOT_VERSION
 +int getpagesize(void) {
 +	return 512;
 +}
@@ -101,7 +101,7 @@ index c90cf46..54ce281 100644
    #define PRINTF_SIZE_T_HEX_SPECIFIER "Ix"
    #define PRINTF_SSIZE_T_SPECIFIER    "Id"
    #define PRINTF_PTRDIFF_T_SPECIFIER  "Id"
-+#elif defined(RIOT)
++#elif defined(RIOT_VERSION)
 +  #define PRINTF_SIZE_T_SPECIFIER      "d"
 +  #define PRINTF_SIZE_T_HEX_SPECIFIER  "x"
 +  #define PRINTF_SSIZE_T_SPECIFIER     "d"
@@ -118,7 +118,7 @@ index 103c88f..6ea603d 100644
  #include "common/daemonize.h"
 
 -#ifndef WIN32
-+#if (!defined(_WIN32)) && (!defined(RIOT))
++#if (!defined(_WIN32)) && (!defined(RIOT_VERSION))
  /**
   * Prepare the start of a daemon. Fork into background,
   * but keep stdin/out/err open and a pipe connected to
@@ -130,7 +130,7 @@ index dedab2c..fdc3e82 100644
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-+#ifndef RIOT
++#ifndef RIOT_VERSION
  #include <net/if.h>
 +#else
 +#include "net_help.h"
@@ -343,7 +343,7 @@ index 78fd5b4..cfba7a9 100644
 
 
 -#ifndef _WIN32
-+#if (!defined(_WIN32)) && (!defined(RIOT))
++#if (!defined(_WIN32)) && (!defined(RIOT_VERSION))
  #include <arpa/inet.h>
  #include <netinet/if_ether.h>
  #include <netinet/ip.h>
@@ -358,7 +358,7 @@ index 78fd5b4..cfba7a9 100644
  #define IF_NAMESIZE 16
  #endif
 
-+#ifdef RIOT
++#ifdef RIOT_VERSION
 +#include "socket_base/socket.h"
 +#define INET_ADDRSTRLEN		(16)
 +#define INET6_ADDRSTRLEN	(48)
@@ -465,7 +465,7 @@ index 4b3e04d..6b52f72 100644
  #include <assert.h>
  #include <stdio.h>
  #include <stdlib.h>
-+#ifdef RIOT
++#ifdef RIOT_VERSION
 +#include "socket_base/socket.h"
 +#include "inet_ntop.h"
 +#else

diff --git a/pkg/oonf_api/0002-port-tests-to-riot.patch b/pkg/oonf_api/0002-port-tests-to-riot.patch
@@ -48,7 +48,7 @@ index 0000000..c286ad3
 +# this has to be the absolute path of the RIOT-base dir
 +export RIOTBASE =$(CURDIR)/../../../../../..
 +
-+export CFLAGS = -DRIOT -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO
++export CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO
 +
 +## Modules to include.
 +
@@ -152,7 +152,7 @@ index 0000000..8a0452d
 +# this has to be the absolute path of the RIOT-base dir
 +export RIOTBASE =$(CURDIR)/../../../../../..
 +
-+export CFLAGS = -DRIOT -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO
++export CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO
 +
 +## Modules to include.
 +

diff --git a/pkg/oonf_api/0003-port-example-to-riot.patch b/pkg/oonf_api/0003-port-example-to-riot.patch
@@ -35,7 +35,7 @@ index 0000000..42f9a55
 +# this has to be the absolute path of the RIOT-base dir
 +export RIOTBASE =$(CURDIR)/../../../../..
 +
-+export CFLAGS = -DRIOT -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO
++export CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO
 +
 +## Modules to include.
 +
@@ -61,7 +61,7 @@ index 9cca869..c786d19 100644
  #include <string.h>
  #include <stdio.h>
 
-+#ifdef RIOT
++#ifdef RIOT_VERSION
 +#include "net_help.h"
 +#define ntohl(val)	NTOHL(val)
 +#endif
@@ -77,7 +77,7 @@ index 59bb741..d05c48c 100644
  #include <string.h>
  #include <stdio.h>
 
-+#ifdef RIOT
++#ifdef RIOT_VERSION
 +#include "net_help.h"
 +#define htonl(val)	HTONL(val)
 +#endif