Merge pull request ARMmbed#1963 from ARMmbed/rename_socket_h

Rename socket.h to ns_socket.h

Author: Arto Kinnunen

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

@@ -18,7 +18,7 @@
 #include "nsconfig.h"
 #include "ns_types.h"
 #include <string.h>
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "nsdynmemLIB.h"
 #include "ns_trace.h"
 #include "NWK_INTERFACE/Include/protocol.h"

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

@@ -22,7 +22,7 @@
 #include "eventOS_scheduler.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/udp.h"
 #include "Common_Protocols/ipv6.h"

source/6LoWPAN/Fragmentation/cipv6_fragmenter.c

@@ -26,7 +26,7 @@
 #include "string.h"
 #include "ns_trace.h"
 #include "randLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/IPHC_Decode/cipv6.h"
 #include "6LoWPAN/Fragmentation/cipv6_fragmenter.h"
 #include "NWK_INTERFACE/Include/protocol.h"

source/6LoWPAN/MAC/mac_helper.h

@@ -19,7 +19,7 @@
 #define MAC_HELPER_H
 
 #include "mlme.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 
 struct channel_list_s;
 struct nwk_scan_params;

source/6LoWPAN/MAC/mac_response_handler.c

@@ -22,8 +22,8 @@
 #include "NWK_INTERFACE/Include/protocol_abstract.h"
 #include "NWK_INTERFACE/Include/protocol_timer.h"
 #include "Service_Libs/mle_service/mle_service_api.h"
-#include "Core/include/address.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_address_internal.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/Thread/thread_common.h"
 #include "6LoWPAN/Thread/thread_management_internal.h"
 #include "6LoWPAN/MAC/mac_helper.h"

source/6LoWPAN/Mesh/mesh.c

@@ -29,7 +29,7 @@
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "NWK_INTERFACE/Include/protocol_stats.h"
 #include "6LoWPAN/IPHC_Decode/cipv6.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "6LoWPAN/Mesh/mesh.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 

source/6LoWPAN/ND/nd_defines.h

@@ -18,7 +18,7 @@
 #ifndef ND_DEFINES_H_
 #define ND_DEFINES_H_
 
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "ns_list.h"
 #include "6LoWPAN/IPHC_Decode/lowpan_context.h"
 #include "Common_Protocols/icmpv6_prefix.h"

source/6LoWPAN/NVM/nwk_nvm.c

@@ -22,7 +22,7 @@
 #include "string.h"
 #include "randLIB.h"
 #include "nsdynmemLIB.h"
-#include "Core/include/socket.h"
+#include "Core/include/ns_socket.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 #include "6LoWPAN/NVM/nwk_nvm.h"

source/6LoWPAN/Thread/thread_address_registration_client.c

@@ -49,7 +49,7 @@
 #include "6LoWPAN/Thread/thread_management_client.h"
 #include "NWK_INTERFACE/Include/protocol.h"
 #include "Common_Protocols/ipv6.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "6LoWPAN/MAC/mac_helper.h"
 
 #ifdef HAVE_THREAD_V2

source/6LoWPAN/Thread/thread_common.c

@@ -88,7 +88,7 @@
 #include "6LoWPAN/MAC/mac_pairwise_key.h"
 #include "6LoWPAN/MAC/mac_data_poll.h"
 #include "Service_Libs/etx/etx.h"
-#include "Core/include/address.h"
+#include "Core/include/ns_address_internal.h"
 #include "6LoWPAN/Thread/thread_nvm_store.h"
 
 #define TRACE_GROUP "thrd"