Skip to content

Commit

Permalink
[SQUASH ME] same treatment for ipv6.h
Browse files Browse the repository at this point in the history
  • Loading branch information
miri64 committed Nov 11, 2014
1 parent d2ab4e0 commit c148a8d
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion sys/net/include/ipv6.h → sys/net/include/ipv6_legacy.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @ingroup net_sixlowpan_legacy
* @{
* @file ipv6.h
* @file ipv6_legacy.h
* @brief IPv6 and ICMP functions
*
* Wraps all API types, constants and functions of
Expand Down
2 changes: 1 addition & 1 deletion sys/net/include/rpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <vtimer.h>
#include <mutex.h>
#include <transceiver.h>
#include "ipv6.h"
#include "ipv6_legacy.h"
#include "rpl/rpl_dodag.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion sys/net/include/rpl/rpl_dodag.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include <string.h>
#include "ipv6.h"
#include "ipv6_legacy.h"
#include "rpl_structs.h"
#include "rpl_config.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/net/include/rpl/rpl_structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include <string.h>
#include "ipv6.h"
#include "ipv6_legacy.h"

#ifndef RPL_STRUCTS_H_INCLUDED
#define RPL_STRUCTS_H_INCLUDED
Expand Down
2 changes: 1 addition & 1 deletion sys/net/include/socket_base/socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <stdint.h>

#include "ipv6.h"
#include "ipv6_legacy.h"

#include "socket_base/in.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/net/transport_layer/socket_base/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <string.h>

#include "hwtimer.h"
#include "ipv6.h"
#include "ipv6_legacy.h"
#include "thread.h"
#include "vtimer.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/net/transport_layer/tcp/tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef TCP_H_
#define TCP_H_

#include "ipv6.h"
#include "ipv6_legacy.h"
#include "socket_base/types.h"
#include "socket.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/net/transport_layer/tcp/tcp_hc.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <stdio.h>
#include <string.h>

#include "ipv6.h"
#include "ipv6_legacy.h"

#include "net_help.h"

Expand Down
2 changes: 1 addition & 1 deletion sys/net/transport_layer/udp/udp.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <stdio.h>
#include <string.h>

#include "ipv6.h"
#include "ipv6_legacy.h"
#include "msg.h"
#include "sixlowpan_legacy.h"
#include "thread.h"
Expand Down
2 changes: 1 addition & 1 deletion sys/net/transport_layer/udp/udp.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifndef UDP_H_
#define UDP_H_

#include "ipv6.h"
#include "ipv6_legacy.h"
#include "socket_base/types.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion sys/posix/pnet/include/netinet/in.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <inttypes.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include "ipv6.h"
#include "ipv6_legacy.h"
#include "socket_base/socket.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion sys/shell/commands/sc_net_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
static uint8_t addr_registered = 0;
static uint8_t addrs[ADDR_REGISTERED_MAX][ADDRS_LEN_MAX];
#else
#include "ipv6.h"
#include "ipv6_legacy.h"
#endif

void _net_if_ifconfig_add(int if_id, int argc, char **argv);
Expand Down
2 changes: 1 addition & 1 deletion tests/pnet/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include "net_if.h"
#include "sixlowpan_legacy.h"
#include "ipv6.h"
#include "ipv6_legacy.h"

#ifndef R_ADDR
#define R_ADDR (1)
Expand Down

0 comments on commit c148a8d

Please sign in to comment.