Skip to content

Commit fc76d1e

Browse files
author
Arto Kinnunen
authored
Merge pull request ARMmbed#1963 from ARMmbed/rename_socket_h
Rename socket.h to ns_socket.h
2 parents ba3a649 + 048f14a commit fc76d1e

File tree

112 files changed

+122
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+122
-122
lines changed

‎source/6LoWPAN/Bootstraps/Generic/network_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "nsconfig.h"
1919
#include "ns_types.h"
2020
#include <string.h>
21-
#include "Core/include/socket.h"
21+
#include "Core/include/ns_socket.h"
2222
#include "nsdynmemLIB.h"
2323
#include "ns_trace.h"
2424
#include "NWK_INTERFACE/Include/protocol.h"

‎source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "eventOS_scheduler.h"
2323
#include "ns_trace.h"
2424
#include "nsdynmemLIB.h"
25-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_socket.h"
2626
#include "NWK_INTERFACE/Include/protocol.h"
2727
#include "Common_Protocols/udp.h"
2828
#include "Common_Protocols/ipv6.h"

‎source/6LoWPAN/Fragmentation/cipv6_fragmenter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "string.h"
2727
#include "ns_trace.h"
2828
#include "randLIB.h"
29-
#include "Core/include/socket.h"
29+
#include "Core/include/ns_socket.h"
3030
#include "6LoWPAN/IPHC_Decode/cipv6.h"
3131
#include "6LoWPAN/Fragmentation/cipv6_fragmenter.h"
3232
#include "NWK_INTERFACE/Include/protocol.h"

‎source/6LoWPAN/MAC/mac_helper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define MAC_HELPER_H
2020

2121
#include "mlme.h"
22-
#include "Core/include/address.h"
22+
#include "Core/include/ns_address_internal.h"
2323

2424
struct channel_list_s;
2525
struct nwk_scan_params;

‎source/6LoWPAN/MAC/mac_response_handler.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "NWK_INTERFACE/Include/protocol_abstract.h"
2323
#include "NWK_INTERFACE/Include/protocol_timer.h"
2424
#include "Service_Libs/mle_service/mle_service_api.h"
25-
#include "Core/include/address.h"
26-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_address_internal.h"
26+
#include "Core/include/ns_socket.h"
2727
#include "6LoWPAN/Thread/thread_common.h"
2828
#include "6LoWPAN/Thread/thread_management_internal.h"
2929
#include "6LoWPAN/MAC/mac_helper.h"

‎source/6LoWPAN/Mesh/mesh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "NWK_INTERFACE/Include/protocol.h"
3030
#include "NWK_INTERFACE/Include/protocol_stats.h"
3131
#include "6LoWPAN/IPHC_Decode/cipv6.h"
32-
#include "Core/include/socket.h"
32+
#include "Core/include/ns_socket.h"
3333
#include "6LoWPAN/Mesh/mesh.h"
3434
#include "6LoWPAN/MAC/mac_helper.h"
3535

‎source/6LoWPAN/ND/nd_defines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef ND_DEFINES_H_
1919
#define ND_DEFINES_H_
2020

21-
#include "Core/include/address.h"
21+
#include "Core/include/ns_address_internal.h"
2222
#include "ns_list.h"
2323
#include "6LoWPAN/IPHC_Decode/lowpan_context.h"
2424
#include "Common_Protocols/icmpv6_prefix.h"

‎source/6LoWPAN/NVM/nwk_nvm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "string.h"
2323
#include "randLIB.h"
2424
#include "nsdynmemLIB.h"
25-
#include "Core/include/socket.h"
25+
#include "Core/include/ns_socket.h"
2626
#include "NWK_INTERFACE/Include/protocol.h"
2727
#include "6LoWPAN/MAC/mac_helper.h"
2828
#include "6LoWPAN/NVM/nwk_nvm.h"

‎source/6LoWPAN/Thread/thread_address_registration_client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#include "6LoWPAN/Thread/thread_management_client.h"
5050
#include "NWK_INTERFACE/Include/protocol.h"
5151
#include "Common_Protocols/ipv6.h"
52-
#include "Core/include/address.h"
52+
#include "Core/include/ns_address_internal.h"
5353
#include "6LoWPAN/MAC/mac_helper.h"
5454

5555
#ifdef HAVE_THREAD_V2

‎source/6LoWPAN/Thread/thread_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
#include "6LoWPAN/MAC/mac_pairwise_key.h"
8989
#include "6LoWPAN/MAC/mac_data_poll.h"
9090
#include "Service_Libs/etx/etx.h"
91-
#include "Core/include/address.h"
91+
#include "Core/include/ns_address_internal.h"
9292
#include "6LoWPAN/Thread/thread_nvm_store.h"
9393

9494
#define TRACE_GROUP "thrd"

0 commit comments

Comments
 (0)