restructure - Fixed include paths damaged by the restructure

geky · geky · commit c2d9fc29ffd2 · 2016-09-30T19:18:09.000-05:00
diff --git a/drivers/FileBase.h b/drivers/FileBase.h
@@ -18,7 +18,8 @@
 
 typedef int FILEHANDLE;
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 
 #if defined(__ARMCC_VERSION) || defined(__ICCARM__)
 #    define O_RDONLY 0
diff --git a/features/netsocket/CellularInterface.cpp b/features/netsocket/CellularInterface.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "network-socket/CellularInterface.h"
+#include "netsocket/CellularInterface.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/features/netsocket/CellularInterface.h b/features/netsocket/CellularInterface.h
@@ -17,7 +17,7 @@
 #ifndef CELLULAR_INTERFACE_H
 #define CELLULAR_INTERFACE_H
  
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/NetworkInterface.h"
  
 
 /** CellularInterface class
diff --git a/features/netsocket/EthInterface.h b/features/netsocket/EthInterface.h
@@ -17,7 +17,7 @@
 #ifndef ETH_INTERFACE_H
 #define ETH_INTERFACE_H
 
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/NetworkInterface.h"
 
 
 /** EthInterface class
diff --git a/features/netsocket/MeshInterface.h b/features/netsocket/MeshInterface.h
@@ -17,7 +17,7 @@
 #ifndef MESH_INTERFACE_H
 #define MESH_INTERFACE_H
 
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/NetworkInterface.h"
 
 
 /** MeshInterface class
diff --git a/features/netsocket/NetworkInterface.cpp b/features/netsocket/NetworkInterface.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "network-socket/NetworkInterface.h"
-#include "network-socket/NetworkStack.h"
+#include "netsocket/NetworkInterface.h"
+#include "netsocket/NetworkStack.h"
 #include <string.h>
 
 
diff --git a/features/netsocket/NetworkInterface.h b/features/netsocket/NetworkInterface.h
@@ -17,8 +17,8 @@
 #ifndef NETWORK_INTERFACE_H
 #define NETWORK_INTERFACE_H
 
-#include "network-socket/nsapi_types.h"
-#include "network-socket/SocketAddress.h"
+#include "netsocket/nsapi_types.h"
+#include "netsocket/SocketAddress.h"
 
 // Predeclared class
 class NetworkStack;
diff --git a/features/netsocket/NetworkStack.h b/features/netsocket/NetworkStack.h
@@ -18,8 +18,8 @@
 #define NETWORK_STACK_H
 
 #include "nsapi_types.h"
-#include "network-socket/SocketAddress.h"
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/SocketAddress.h"
+#include "netsocket/NetworkInterface.h"
 
 
 /** NetworkStack class
diff --git a/features/netsocket/Socket.h b/features/netsocket/Socket.h
@@ -17,8 +17,8 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
-#include "network-socket/SocketAddress.h"
-#include "network-socket/NetworkStack.h"
+#include "netsocket/SocketAddress.h"
+#include "netsocket/NetworkStack.h"
 #include "rtos/Mutex.h"
 #include "Callback.h"
 #include "toolchain.h"
diff --git a/features/netsocket/TCPServer.h b/features/netsocket/TCPServer.h
@@ -17,10 +17,10 @@
 #ifndef TCPSERVER_H
 #define TCPSERVER_H
 
-#include "network-socket/Socket.h"
-#include "network-socket/TCPSocket.h"
-#include "network-socket/NetworkStack.h"
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/Socket.h"
+#include "netsocket/TCPSocket.h"
+#include "netsocket/NetworkStack.h"
+#include "netsocket/NetworkInterface.h"
 #include "rtos/Semaphore.h"
 
 
diff --git a/features/netsocket/TCPSocket.h b/features/netsocket/TCPSocket.h
@@ -17,9 +17,9 @@
 #ifndef TCPSOCKET_H
 #define TCPSOCKET_H
 
-#include "network-socket/Socket.h"
-#include "network-socket/NetworkStack.h"
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/Socket.h"
+#include "netsocket/NetworkStack.h"
+#include "netsocket/NetworkInterface.h"
 #include "rtos/Semaphore.h"
 
 
diff --git a/features/netsocket/UDPSocket.h b/features/netsocket/UDPSocket.h
@@ -17,9 +17,9 @@
 #ifndef UDPSOCKET_H
 #define UDPSOCKET_H
 
-#include "network-socket/Socket.h"
-#include "network-socket/NetworkStack.h"
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/Socket.h"
+#include "netsocket/NetworkStack.h"
+#include "netsocket/NetworkInterface.h"
 #include "rtos/Semaphore.h"
 
 
diff --git a/features/netsocket/WiFiInterface.cpp b/features/netsocket/WiFiInterface.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "network-socket/WiFiInterface.h"
+#include "netsocket/WiFiInterface.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/features/netsocket/WiFiInterface.h b/features/netsocket/WiFiInterface.h
@@ -17,7 +17,7 @@
 #ifndef WIFI_INTERFACE_H
 #define WIFI_INTERFACE_H
 
-#include "network-socket/NetworkInterface.h"
+#include "netsocket/NetworkInterface.h"
 
 
 /** Enum of WiFi encryption types
diff --git a/features/netsocket/nsapi.h b/features/netsocket/nsapi.h
@@ -24,19 +24,19 @@
 #ifdef __cplusplus
 
 // entry point for C++ api
-#include "network-socket/SocketAddress.h"
-#include "network-socket/NetworkStack.h"
-
-#include "network-socket/NetworkInterface.h"
-#include "network-socket/EthInterface.h"
-#include "network-socket/WiFiInterface.h"
-#include "network-socket/CellularInterface.h"
-#include "network-socket/MeshInterface.h"
-
-#include "network-socket/Socket.h"
-#include "network-socket/UDPSocket.h"
-#include "network-socket/TCPSocket.h"
-#include "network-socket/TCPServer.h"
+#include "netsocket/SocketAddress.h"
+#include "netsocket/NetworkStack.h"
+
+#include "netsocket/NetworkInterface.h"
+#include "netsocket/EthInterface.h"
+#include "netsocket/WiFiInterface.h"
+#include "netsocket/CellularInterface.h"
+#include "netsocket/MeshInterface.h"
+
+#include "netsocket/Socket.h"
+#include "netsocket/UDPSocket.h"
+#include "netsocket/TCPSocket.h"
+#include "netsocket/TCPServer.h"
 
 #endif
 
diff --git a/features/netsocket/nsapi_dns.cpp b/features/netsocket/nsapi_dns.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "nsapi_dns.h"
-#include "network-socket/UDPSocket.h"
+#include "netsocket/UDPSocket.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/features/netsocket/nsapi_dns.h b/features/netsocket/nsapi_dns.h
@@ -19,7 +19,7 @@
 
 #include "nsapi_types.h"
 #ifdef __cplusplus
-#include "network-socket/NetworkStack.h"
+#include "netsocket/NetworkStack.h"
 #endif
 
 #ifndef __cplusplus
diff --git a/mbed.h b/mbed.h
@@ -23,7 +23,7 @@
 #endif
 
 #if MBED_CONF_NSAPI_PRESENT
-#include "network-socket/nsapi.h"
+#include "netsocket/nsapi.h"
 #endif
 
 #if MBED_CONF_EVENTS_PRESENT
diff --git a/platform/platform.h b/platform/platform.h
@@ -16,13 +16,13 @@
 #ifndef MBED_PLATFORM_H
 #define MBED_PLATFORM_H
 
-#include "device.h"
-#include "PinNames.h"
-#include "PeripheralNames.h"
-
 #include <cstddef>
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
 
+#include "device.h"
+#include "PinNames.h"
+#include "PeripheralNames.h"
+
 #endif
