- changed header inclusion. All libiec61850 now include libiec61850_platform_includes.h. All standard headers should be included from there.

src/common/conversions.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "conversions.h"
 
 #include <time.h>

src/common/inc/libiec61850_platform_includes.h

@@ -10,6 +10,8 @@
 #include "string_utilities.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "platform_endian.h"
 

src/common/lib_memory.c

@@ -21,7 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-#include "lib_memory.h"
+#include "libiec61850_platform_includes.h"
 
 static MemoryExceptionHandler exceptionHandler = NULL;
 static void* exceptionHandlerParameter = NULL;

src/common/mem_alloc_linked_list.c

@@ -21,7 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-
+#include "libiec61850_platform_includes.h"
 #include "mem_alloc_linked_list.h"
 
 struct sMemAllocLinkedList {

src/common/simple_allocator.c

@@ -21,8 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-#include <stdlib.h>
+#include "libiec61850_platform_includes.h"
-
 #include "simple_allocator.h"
 
 void

src/common/string_utilities.c

@@ -21,7 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
-#include "string_utilities.h"
+#include "libiec61850_platform_includes.h"
 
 char*
 copySubString(char* startPos, char* endPos)

src/hal/ethernet/bsd/ethernet_bsd.c

@@ -30,10 +30,8 @@
 #include <net/if_dl.h>
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <fcntl.h>
 
 #include "libiec61850_platform_includes.h"

src/hal/ethernet/linux/ethernet_linux.c

@@ -29,11 +29,7 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
 
 #include "libiec61850_platform_includes.h"
 #include "hal_ethernet.h"

src/hal/ethernet/win32/ethernet_win32.c

@@ -23,13 +23,12 @@
 
 #include "stack_config.h"
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
 
 #include "hal_ethernet.h"
 
+#include "libiec61850_platform_includes.h"
+
 #if (CONFIG_INCLUDE_ETHERNET_WINDOWS == 1)
 
 

src/hal/filesystem/linux/file_provider_linux.c

@@ -21,12 +21,8 @@
  *  See COPYING file for the complete license text.
  */
 
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <dirent.h>
-#include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/hal/filesystem/win32/file_provider_win32.c

@@ -22,10 +22,8 @@
  */
 
 #include <stdbool.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/hal/socket/bsd/socket_bsd.c

@@ -26,10 +26,7 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <errno.h>

src/hal/socket/linux/socket_linux.c

@@ -26,10 +26,7 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <errno.h>

src/hal/socket/win32/socket_win32.c

@@ -23,8 +23,6 @@
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <stdio.h>
-#include <stdbool.h>
 #include <windows.h>
 
 #pragma comment (lib, "Ws2_32.lib")

src/hal/thread/linux/thread_linux.c

@@ -24,7 +24,6 @@
 
 #include <pthread.h>
 #include <semaphore.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include "hal_thread.h"
 

src/hal/thread/win32/thread_win32.c

@@ -22,7 +22,6 @@
  */
 
 #include <windows.h>
-#include <stdlib.h>
 #include "libiec61850_platform_includes.h"
 #include "hal_thread.h"
 

src/iec61850/client/client_goose_control.c

@@ -29,8 +29,7 @@
 
 #include "ied_connection_private.h"
 
-#include "lib_memory.h"
+#include "libiec61850_platform_includes.h"
-#include "string_utilities.h"
 
 struct sClientGooseControlBlock {
     char* objectReference;

src/iec61850/client/client_report.c

@@ -29,8 +29,7 @@
 
 #include "ied_connection_private.h"
 
-#include "lib_memory.h"
+#include "libiec61850_platform_includes.h"
-#include "string_utilities.h"
 
 struct sClientReport
 {

src/iec61850/client/client_report_control.c

@@ -29,8 +29,7 @@
 
 #include "ied_connection_private.h"
 
-#include "lib_memory.h"
+#include "libiec61850_platform_includes.h"
-#include "string_utilities.h"
 
 static bool
 isBufferedRcb(const char* objectReference)

src/iec61850/server/impl/client_connection.c

@@ -29,7 +29,8 @@
 #include "hal_thread.h"
 
 #include "ied_server_private.h"
-//#include "mms_server.h"
+
+#include "libiec61850_platform_includes.h"
 
 struct sClientConnection {
 

src/iec61850/server/impl/ied_server.c

@@ -31,6 +31,8 @@
 #include "hal_thread.h"
 #include "reporting.h"
 
+#include "libiec61850_platform_includes.h"
+
 #ifndef DEBUG_IED_SERVER
 #define DEBUG_IED_SERVER 0
 #endif

src/iec61850/server/mms_mapping/control.c

@@ -31,6 +31,8 @@
 
 #include "mms_value_internal.h"
 
+#include "libiec61850_platform_includes.h"
+
 #if (CONFIG_IEC61850_CONTROL_SERVICE == 1)
 
 #ifndef DEBUG_IED_SERVER

src/iec61850/server/model/cdc.c

@@ -25,6 +25,7 @@
 
 #include "iec61850_dynamic_model.h"
 #include "iec61850_cdc.h"
+#include "libiec61850_platform_includes.h"
 
 /************************************************
  * Constructed Attribute Classes

src/iec61850/server/model/config_file_parser.c

@@ -28,9 +28,6 @@
 #include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 
-#include "string_utilities.h"
-#include <stdio.h>
-
 #define READ_BUFFER_MAX_SIZE 1024
 
 static uint8_t lineBuffer[READ_BUFFER_MAX_SIZE];

src/iec61850/server/model/dynamic_model.c

@@ -21,9 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
-
 #include "iec61850_server.h"
-#include "string_utilities.h"
 #include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 

src/mms/asn1/ber_decode.c

@@ -21,8 +21,8 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "ber_decode.h"
-#include "platform_endian.h"
 
 int
 BerDecoder_decodeLength(uint8_t* buffer, int* length, int bufPos, int maxBufPos)

src/mms/asn1/ber_encoder.c

@@ -23,8 +23,6 @@
 
 #include "libiec61850_platform_includes.h"
 #include "ber_encoder.h"
-#include "platform_endian.h"
-
 
 int
 BerEncoder_encodeLength(uint32_t length, uint8_t* buffer, int bufPos)

src/mms/asn1/ber_integer.c

@@ -22,7 +22,6 @@
  */
 
 #include "libiec61850_platform_includes.h"
-#include "platform_endian.h"
 #include "ber_integer.h"
 #include "ber_encoder.h"
 

src/mms/iso_acse/acse.c

@@ -21,8 +21,8 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "acse.h"
-
 #include "ber_encoder.h"
 #include "ber_decode.h"
 

src/mms/iso_cotp/cotp.c

@@ -25,6 +25,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "cotp.h"
 #include "byte_buffer.h"

src/mms/iso_mms/client/mms_client_common.c

@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "mms_common.h"
 #include "mms_client_connection.h"

src/mms/iso_mms/client/mms_client_files.c

@@ -21,11 +21,11 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 #include "ber_encoder.h"

src/mms/iso_mms/client/mms_client_get_namelist.c

@@ -21,12 +21,12 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 #include "mms_client_internal.h"
 
 #include "ber_decode.h"

src/mms/iso_mms/client/mms_client_get_var_access.c

@@ -21,12 +21,12 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 

src/mms/iso_mms/client/mms_client_identify.c

@@ -21,11 +21,11 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 #include "ber_encoder.h"

src/mms/iso_mms/client/mms_client_initiate.c

@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "mms_common.h"
 #include "mms_common_internal.h"

src/mms/iso_mms/client/mms_client_named_variable_list.c

@@ -23,12 +23,12 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 #include "mms_client_internal.h"
 #include "mms_common_internal.h"
 

src/mms/iso_mms/client/mms_client_read.c

@@ -28,8 +28,6 @@
 #include "byte_buffer.h"
 #include "stack_config.h"
 
-#include "platform_endian.h"
-
 #include "mms_client_internal.h"
 #include "mms_common_internal.h"
 #include "mms_value_internal.h"

src/mms/iso_mms/client/mms_client_status.c

@@ -21,11 +21,11 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "stack_config.h"
 #include "mms_common.h"
 #include "mms_client_connection.h"
 #include "byte_buffer.h"
-#include "string_utilities.h"
 
 #include "mms_client_internal.h"
 #include "ber_encoder.h"

src/mms/iso_mms/client/mms_client_write.c

@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include <MmsPdu.h>
 #include "mms_common.h"
 #include "mms_client_connection.h"

src/mms/iso_mms/common/mms_common_msg.c

@@ -23,9 +23,7 @@
 
 #include "libiec61850_platform_includes.h"
 #include "mms_common_internal.h"
-#include "platform_endian.h"
 #include "stack_config.h"
-#include "string_utilities.h"
 #include "mms_value_internal.h"
 
 void

src/mms/iso_mms/common/mms_value.c

@@ -26,9 +26,6 @@
 #include "mms_value.h"
 #include "mms_type_spec.h"
 
-#include "string_utilities.h"
-#include "platform_endian.h"
-
 #include "mms_common_internal.h"
 
 #include "mms_value_internal.h"

src/mms/iso_mms/server/mms_access_result.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_access_result.h"
 #include "mms_server_internal.h"
 #include "mms_value_internal.h"

src/mms/iso_mms/server/mms_association_service.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 /**********************************************************************************************

src/mms/iso_mms/server/mms_device.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "mms_device_model.h"
 #include "stack_config.h"

src/mms/iso_mms/server/mms_domain.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_device_model.h"
 #include "mms_server_internal.h"
 

src/mms/iso_mms/server/mms_file_service.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if (MMS_FILE_SERVICE == 1)

src/mms/iso_mms/server/mms_get_namelist_service.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "ber_encoder.h"
 #include "ber_decode.h"

src/mms/iso_mms/server/mms_get_var_access_service.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if (MMS_GET_VARIABLE_ACCESS_ATTRIBUTES == 1)

src/mms/iso_mms/server/mms_identify_service.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if MMS_IDENTIFY_SERVICE == 1

src/mms/iso_mms/server/mms_named_variable_list_service.c

@@ -21,10 +21,10 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "mms_named_variable_list.h"
 
-#include "string_utilities.h"
 #include "ber_encoder.h"
 
 #if (MMS_DATA_SET_SERVICE == 1)

src/mms/iso_mms/server/mms_server.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server.h"
 #include "mms_server_connection.h"
 #include "mms_value_cache.h"

src/mms/iso_mms/server/mms_server_common.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 /* write_out function required for ASN.1 encoding */

src/mms/iso_mms/server/mms_status_service.c

@@ -21,6 +21,7 @@
  *  See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 
 #if MMS_STATUS_SERVICE == 1

src/mms/iso_mms/server/mms_value_cache.c

@@ -23,7 +23,6 @@
 
 #include "libiec61850_platform_includes.h"
 #include "mms_value_cache.h"
-#include "string_utilities.h"
 #include "string_map.h"
 #include "stack_config.h"
 

src/mms/iso_mms/server/mms_write_service.c

@@ -21,6 +21,7 @@
  *	See COPYING file for the complete license text.
  */
 
+#include "libiec61850_platform_includes.h"
 #include "mms_server_internal.h"
 #include "mms_common_internal.h"
 #include "mms_types.h"