Skip to content

Commit c2d9fc2

Browse files
committed
restructure - Fixed include paths damaged by the restructure
1 parent 960d69f commit c2d9fc2

19 files changed

+46
-45
lines changed

drivers/FileBase.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
typedef int FILEHANDLE;
2020

21-
#include <stdio.h>
21+
#include <cstdio>
22+
#include <cstring>
2223

2324
#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
2425
# define O_RDONLY 0

features/netsocket/CellularInterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "network-socket/CellularInterface.h"
17+
#include "netsocket/CellularInterface.h"
1818
#include <stdlib.h>
1919
#include <string.h>
2020

features/netsocket/CellularInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef CELLULAR_INTERFACE_H
1818
#define CELLULAR_INTERFACE_H
1919

20-
#include "network-socket/NetworkInterface.h"
20+
#include "netsocket/NetworkInterface.h"
2121

2222

2323
/** CellularInterface class

features/netsocket/EthInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef ETH_INTERFACE_H
1818
#define ETH_INTERFACE_H
1919

20-
#include "network-socket/NetworkInterface.h"
20+
#include "netsocket/NetworkInterface.h"
2121

2222

2323
/** EthInterface class

features/netsocket/MeshInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef MESH_INTERFACE_H
1818
#define MESH_INTERFACE_H
1919

20-
#include "network-socket/NetworkInterface.h"
20+
#include "netsocket/NetworkInterface.h"
2121

2222

2323
/** MeshInterface class

features/netsocket/NetworkInterface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "network-socket/NetworkInterface.h"
18-
#include "network-socket/NetworkStack.h"
17+
#include "netsocket/NetworkInterface.h"
18+
#include "netsocket/NetworkStack.h"
1919
#include <string.h>
2020

2121

features/netsocket/NetworkInterface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#ifndef NETWORK_INTERFACE_H
1818
#define NETWORK_INTERFACE_H
1919

20-
#include "network-socket/nsapi_types.h"
21-
#include "network-socket/SocketAddress.h"
20+
#include "netsocket/nsapi_types.h"
21+
#include "netsocket/SocketAddress.h"
2222

2323
// Predeclared class
2424
class NetworkStack;

features/netsocket/NetworkStack.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#define NETWORK_STACK_H
1919

2020
#include "nsapi_types.h"
21-
#include "network-socket/SocketAddress.h"
22-
#include "network-socket/NetworkInterface.h"
21+
#include "netsocket/SocketAddress.h"
22+
#include "netsocket/NetworkInterface.h"
2323

2424

2525
/** NetworkStack class

features/netsocket/Socket.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#ifndef SOCKET_H
1818
#define SOCKET_H
1919

20-
#include "network-socket/SocketAddress.h"
21-
#include "network-socket/NetworkStack.h"
20+
#include "netsocket/SocketAddress.h"
21+
#include "netsocket/NetworkStack.h"
2222
#include "rtos/Mutex.h"
2323
#include "Callback.h"
2424
#include "toolchain.h"

features/netsocket/TCPServer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#ifndef TCPSERVER_H
1818
#define TCPSERVER_H
1919

20-
#include "network-socket/Socket.h"
21-
#include "network-socket/TCPSocket.h"
22-
#include "network-socket/NetworkStack.h"
23-
#include "network-socket/NetworkInterface.h"
20+
#include "netsocket/Socket.h"
21+
#include "netsocket/TCPSocket.h"
22+
#include "netsocket/NetworkStack.h"
23+
#include "netsocket/NetworkInterface.h"
2424
#include "rtos/Semaphore.h"
2525

2626

features/netsocket/TCPSocket.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#ifndef TCPSOCKET_H
1818
#define TCPSOCKET_H
1919

20-
#include "network-socket/Socket.h"
21-
#include "network-socket/NetworkStack.h"
22-
#include "network-socket/NetworkInterface.h"
20+
#include "netsocket/Socket.h"
21+
#include "netsocket/NetworkStack.h"
22+
#include "netsocket/NetworkInterface.h"
2323
#include "rtos/Semaphore.h"
2424

2525

features/netsocket/UDPSocket.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#ifndef UDPSOCKET_H
1818
#define UDPSOCKET_H
1919

20-
#include "network-socket/Socket.h"
21-
#include "network-socket/NetworkStack.h"
22-
#include "network-socket/NetworkInterface.h"
20+
#include "netsocket/Socket.h"
21+
#include "netsocket/NetworkStack.h"
22+
#include "netsocket/NetworkInterface.h"
2323
#include "rtos/Semaphore.h"
2424

2525

features/netsocket/WiFiInterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "network-socket/WiFiInterface.h"
17+
#include "netsocket/WiFiInterface.h"
1818
#include <stdlib.h>
1919
#include <string.h>
2020

features/netsocket/WiFiInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef WIFI_INTERFACE_H
1818
#define WIFI_INTERFACE_H
1919

20-
#include "network-socket/NetworkInterface.h"
20+
#include "netsocket/NetworkInterface.h"
2121

2222

2323
/** Enum of WiFi encryption types

features/netsocket/nsapi.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
#ifdef __cplusplus
2525

2626
// entry point for C++ api
27-
#include "network-socket/SocketAddress.h"
28-
#include "network-socket/NetworkStack.h"
29-
30-
#include "network-socket/NetworkInterface.h"
31-
#include "network-socket/EthInterface.h"
32-
#include "network-socket/WiFiInterface.h"
33-
#include "network-socket/CellularInterface.h"
34-
#include "network-socket/MeshInterface.h"
35-
36-
#include "network-socket/Socket.h"
37-
#include "network-socket/UDPSocket.h"
38-
#include "network-socket/TCPSocket.h"
39-
#include "network-socket/TCPServer.h"
27+
#include "netsocket/SocketAddress.h"
28+
#include "netsocket/NetworkStack.h"
29+
30+
#include "netsocket/NetworkInterface.h"
31+
#include "netsocket/EthInterface.h"
32+
#include "netsocket/WiFiInterface.h"
33+
#include "netsocket/CellularInterface.h"
34+
#include "netsocket/MeshInterface.h"
35+
36+
#include "netsocket/Socket.h"
37+
#include "netsocket/UDPSocket.h"
38+
#include "netsocket/TCPSocket.h"
39+
#include "netsocket/TCPServer.h"
4040

4141
#endif
4242

features/netsocket/nsapi_dns.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717
#include "nsapi_dns.h"
18-
#include "network-socket/UDPSocket.h"
18+
#include "netsocket/UDPSocket.h"
1919
#include <string.h>
2020
#include <stdlib.h>
2121
#include <stdio.h>

features/netsocket/nsapi_dns.h

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

2020
#include "nsapi_types.h"
2121
#ifdef __cplusplus
22-
#include "network-socket/NetworkStack.h"
22+
#include "netsocket/NetworkStack.h"
2323
#endif
2424

2525
#ifndef __cplusplus

mbed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#endif
2424

2525
#if MBED_CONF_NSAPI_PRESENT
26-
#include "network-socket/nsapi.h"
26+
#include "netsocket/nsapi.h"
2727
#endif
2828

2929
#if MBED_CONF_EVENTS_PRESENT

platform/platform.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#ifndef MBED_PLATFORM_H
1717
#define MBED_PLATFORM_H
1818

19-
#include "device.h"
20-
#include "PinNames.h"
21-
#include "PeripheralNames.h"
22-
2319
#include <cstddef>
2420
#include <cstdlib>
2521
#include <cstdio>
2622
#include <cstring>
2723

24+
#include "device.h"
25+
#include "PinNames.h"
26+
#include "PeripheralNames.h"
27+
2828
#endif

0 commit comments

Comments
 (0)