From 5df92b69307470fefbabdefc7f678522f039522c Mon Sep 17 00:00:00 2001 From: Julius Pfrommer Date: Thu, 27 Apr 2023 23:57:56 +0200 Subject: [PATCH] refactor(core): Remove support for VS2008 and older --- CMakeLists.txt | 6 -- appveyor.yml | 4 -- include/open62541/architecture_definitions.h | 58 ++------------------ 3 files changed, 4 insertions(+), 64 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e35a0c25b..f88dc01c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -486,11 +486,6 @@ if(UA_ENABLE_PUBSUB_MQTT) if(WIN32) MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL") endif() - # Warn if run in Windows and the MSVC Version is lower than VS 12.0 - if(WIN32 AND MSVC_VERSION LESS 1800) - message(WARNING "The MSVC version does not support the C99 standard. Therefore the file stdint.h will be included.") - configure_file(${PROJECT_SOURCE_DIR}/deps/ms_stdint.h "${PROJECT_BINARY_DIR}/src_generated/stdint.h" COPYONLY) - endif() if(NOT UA_ENABLE_PUBSUB) message(FATAL_ERROR "Mqtt cannot be used with disabled PubSub function.") endif() @@ -947,7 +942,6 @@ if(UA_ENABLE_HISTORIZING) endif() set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h - ${PROJECT_SOURCE_DIR}/deps/ms_stdint.h ${PROJECT_SOURCE_DIR}/include/open62541/architecture_definitions.h ${exported_headers} ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h diff --git a/appveyor.yml b/appveyor.yml index ad3d9ed67..4c910a401 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,10 +17,6 @@ environment: APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -m0=lzma -mx=9 matrix: - - CC_NAME: Visual Studio 9 2008 - CC_SHORTNAME: vs2008 - GENERATOR: Visual Studio 9 2008 - FORCE_CXX: ON - CC_NAME: Visual Studio 12 2013 CC_SHORTNAME: vs2013 GENERATOR: Visual Studio 12 2013 diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h index 08ae54979..3ab1d934f 100644 --- a/include/open62541/architecture_definitions.h +++ b/include/open62541/architecture_definitions.h @@ -15,62 +15,12 @@ /** * C99 Definitions * --------------- */ -#include #include +#include +#include +#include #include - -/* Include stdint.h and stdbool.h or workaround for older Visual Studios */ -#ifdef UNDER_CE -# include "stdint.h" -#endif -#if !defined(_MSC_VER) || _MSC_VER >= 1800 -# include -# include /* C99 Boolean */ -#else -# include "ms_stdint.h" -# if !defined(__bool_true_false_are_defined) -# define bool unsigned char -# define true 1 -# define false 0 -# define __bool_true_false_are_defined -# endif -#endif - -/* Include inttypes.h or workaround for older Visual Studios */ -#if !defined(_MSC_VER) || _MSC_VER >= 1800 -# include -#else -# define __PRI_8_LENGTH_MODIFIER__ "hh" -# define __PRI_64_LENGTH_MODIFIER__ "ll" - -# define PRId8 __PRI_8_LENGTH_MODIFIER__ "d" -# define PRIi8 __PRI_8_LENGTH_MODIFIER__ "i" -# define PRIo8 __PRI_8_LENGTH_MODIFIER__ "o" -# define PRIu8 __PRI_8_LENGTH_MODIFIER__ "u" -# define PRIx8 __PRI_8_LENGTH_MODIFIER__ "x" -# define PRIX8 __PRI_8_LENGTH_MODIFIER__ "X" - -# define PRId16 "hd" -# define PRIi16 "hi" -# define PRIo16 "ho" -# define PRIu16 "hu" -# define PRIx16 "hx" -# define PRIX16 "hX" - -# define PRId32 "ld" -# define PRIi32 "li" -# define PRIo32 "lo" -# define PRIu32 "lu" -# define PRIx32 "lx" -# define PRIX32 "lX" - -# define PRId64 __PRI_64_LENGTH_MODIFIER__ "d" -# define PRIi64 __PRI_64_LENGTH_MODIFIER__ "i" -# define PRIo64 __PRI_64_LENGTH_MODIFIER__ "o" -# define PRIu64 __PRI_64_LENGTH_MODIFIER__ "u" -# define PRIx64 __PRI_64_LENGTH_MODIFIER__ "x" -# define PRIX64 __PRI_64_LENGTH_MODIFIER__ "X" -#endif +#include /** * Inline Functions