From dbcc3f47fe5abd2102750cdd3ace7f92619e8dd0 Mon Sep 17 00:00:00 2001 From: David Antler Date: Fri, 26 Aug 2016 14:39:56 -0700 Subject: [PATCH] Generate iotivity_config.h at build time This patch lightens the burden for those wishing to integrate the IoTivity CSDK into their project. - Remove (almost) all HAVE_*_H from the command line. - Build new file: resource/c_common/iotivity_config.h - Include "iotivity_config.h" in headers which #include platform-specific header files. - Added out/*/*/*/include/c_common/iotivity_config.h which will include the HAVE_*_H build flags. - Export files from out/*/*/*/include/c_common/windows/include/*.h Change-Id: Ib8a7e83c8ceb025c29b11284ee2912f95c930ca6 Signed-off-by: David Antler Reviewed-on: https://gerrit.iotivity.org/gerrit/10989 Reviewed-by: Dave Thaler Reviewed-by: Soemin Tjong Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Jon A. Cruz --- .gitignore | 3 + build_common/SConscript | 46 --------- extlibs/timer/timer.c | 2 +- extlibs/timer/timer.h | 1 + extlibs/tinydtls/tests/dtls-server.c | 1 + iotivity.pc.in | 1 + resource/c_common/SConscript | 111 ++++++++++++++++++++- resource/c_common/ocrandom/src/ocrandom.c | 3 +- resource/c_common/oic_time/src/oic_time.c | 1 + resource/c_common/windows/SConscript | 3 + resource/csdk/connectivity/api/cacommon.h | 2 + .../connectivity/common/src/camutex_pthreads.c | 2 +- .../common/src/cathreadpool_pthreads.c | 1 + resource/csdk/connectivity/inc/caadapternetdtls.h | 1 - resource/csdk/connectivity/inc/caadapterutils.h | 2 + .../src/adapter_util/caadapternetdtls.c | 2 +- .../connectivity/src/adapter_util/caadapterutils.c | 1 + resource/csdk/connectivity/src/caprotocolmessage.c | 1 + resource/csdk/connectivity/src/caqueueingthread.c | 1 + resource/csdk/connectivity/src/caretransmission.c | 3 +- .../csdk/connectivity/src/ip_adapter/caipserver.c | 2 +- resource/csdk/connectivity/test/camutex_tests.cpp | 2 +- resource/csdk/connectivity/test/catests.cpp | 1 + resource/csdk/logger/src/logger.c | 3 +- .../security/include/securevirtualresourcetypes.h | 4 +- .../provisioning/sample/provisioningclient.c | 3 +- .../provisioning/sample/sampleserver_justworks.cpp | 1 + .../provisioning/sample/sampleserver_randompin.cpp | 1 + .../provisioning/src/ownershiptransfermanager.c | 1 + .../csdk/security/provisioning/src/pmutility.c | 3 +- .../provisioning/src/secureresourceprovider.c | 1 + .../unittest/provisioningdatabasemanager.cpp | 1 + resource/csdk/security/src/aclresource.c | 3 +- resource/csdk/security/src/credresource.c | 1 + resource/csdk/security/src/directpairing.c | 1 + resource/csdk/security/src/doxmresource.c | 3 +- resource/csdk/security/src/dpairingresource.c | 1 + resource/csdk/security/src/iotvticalendar.c | 1 + resource/csdk/security/src/pconfresource.c | 1 + resource/csdk/security/src/verresource.c | 3 +- resource/csdk/security/unittest/pstatresource.cpp | 1 + .../security/unittest/securityresourcemanager.cpp | 1 + resource/csdk/stack/include/octypes.h | 2 +- .../samples/linux/SimpleClientServer/occlient.cpp | 2 +- .../linux/SimpleClientServer/occlientbasicops.cpp | 1 + .../linux/SimpleClientServer/occlientcoll.cpp | 1 + .../linux/SimpleClientServer/occlientslow.cpp | 1 + .../samples/linux/SimpleClientServer/ocserver.cpp | 2 +- .../linux/SimpleClientServer/ocserverbasicops.cpp | 1 + .../linux/SimpleClientServer/ocservercoll.cpp | 2 +- .../linux/SimpleClientServer/ocserverslow.cpp | 1 + .../stack/samples/linux/secure/ocamsservice.cpp | 3 +- .../samples/linux/secure/occlientbasicops.cpp | 2 +- .../samples/linux/secure/occlientdirectpairing.cpp | 2 +- .../samples/linux/secure/ocserverbasicops.cpp | 2 +- .../samples/tizen/build/packaging/com.oic.ri.spec | 1 + resource/csdk/stack/src/occlientcb.c | 2 +- resource/csdk/stack/src/ocpayload.c | 1 + resource/csdk/stack/src/ocresource.c | 1 + resource/csdk/stack/src/ocstack.c | 2 +- resource/csdk/stack/src/oicgroup.c | 4 +- resource/csdk/stack/src/oicresourcedirectory.c | 1 + resource/examples/lightserver.cpp | 1 + resource/examples/presenceserver.cpp | 4 +- resource/examples/simpleclient.cpp | 1 + resource/examples/simpleclientHQ.cpp | 9 +- resource/examples/simpleserver.cpp | 4 +- resource/examples/simpleserverHQ.cpp | 2 +- resource/examples/threadingsample.cpp | 2 +- resource/src/OCResource.cpp | 1 + 70 files changed, 197 insertions(+), 88 deletions(-) diff --git a/.gitignore b/.gitignore index 62afd32..4f34ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,9 @@ resource/csdk/stack/samples/linux/SimpleClientServer/release/ resource/csdk/connectivity/build/out/ +# Ignore autogenerated files +resource/c_common/iotivity_config.h + resource/oc_logger/bin/ resource/oc_logger/lib/ resource/oc_logger/samples/linux/release/ diff --git a/build_common/SConscript b/build_common/SConscript index 59a063f..23910b6 100644 --- a/build_common/SConscript +++ b/build_common/SConscript @@ -431,52 +431,6 @@ conf = Configure(env, # POSIX_SUPPORTED, 1 if it is supported, 0 otherwise conf.CheckPThreadsSupport() -###################################################################### -# Generate macros for presence of headers -###################################################################### -cxx_headers = ['arpa/inet.h', - 'fcntl.h', - 'grp.h', - 'in6addr.h', - 'linux/limits.h', - 'memory.h', - 'netdb.h', - 'netinet/in.h', - 'pthread.h', - 'pwd.h', - 'stdlib.h', - 'string.h', - 'strings.h', - 'sys/socket.h', - 'sys/stat.h', - 'sys/time.h', - 'sys/timeb.h', - 'sys/types.h', - 'sys/unistd.h', - 'syslog.h', - 'time.h', - 'unistd.h', - 'uuid/uuid.h', - 'windows.h', - 'winsock2.h', - 'ws2tcpip.h'] - -if target_os == 'arduino': - # Detection of headers on the Arduino platform is currently broken. - cxx_headers = [] - -if target_os == 'msys_nt': - # WinPThread provides a pthread.h, but we want to use native threads. - cxx_headers.remove('pthread.h') - -def get_define_from_header_file(header_file): - header_file_converted = header_file.replace("/","_").replace(".","_").upper() - return "HAVE_" + header_file_converted - -for header_file_name in cxx_headers: - if conf.CheckCXXHeader(header_file_name): - conf.env.AppendUnique(CPPDEFINES = [get_define_from_header_file(header_file_name)]) - env = conf.Finish() ###################################################################### diff --git a/extlibs/timer/timer.c b/extlibs/timer/timer.c index 3dda84b..08b9a6e 100755 --- a/extlibs/timer/timer.c +++ b/extlibs/timer/timer.c @@ -22,6 +22,7 @@ #define _BSD_SOURCE +#include "iotivity_config.h" #ifdef HAVE_WINDOWS_H #include #endif @@ -40,7 +41,6 @@ #ifdef HAVE_STRING_H #include #endif -#include "platform_features.h" #include diff --git a/extlibs/timer/timer.h b/extlibs/timer/timer.h index 3ad432a..ffa304c 100644 --- a/extlibs/timer/timer.h +++ b/extlibs/timer/timer.h @@ -21,6 +21,7 @@ #ifndef TIMER_H_ #define TIMER_H_ +#include "iotivity_config.h" #ifdef HAVE_SYS_TIME_H #include #endif diff --git a/extlibs/tinydtls/tests/dtls-server.c b/extlibs/tinydtls/tests/dtls-server.c index 9a8918a..07acd18 100644 --- a/extlibs/tinydtls/tests/dtls-server.c +++ b/extlibs/tinydtls/tests/dtls-server.c @@ -2,6 +2,7 @@ /* This is needed for apple */ #define __APPLE_USE_RFC_3542 +#include "iotivity_config.h" #include #include #include diff --git a/iotivity.pc.in b/iotivity.pc.in index 59bd6b5..6057152 100644 --- a/iotivity.pc.in +++ b/iotivity.pc.in @@ -13,6 +13,7 @@ URL: https://www.iotivity.org Requires: Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction Cflags: -I${includedir}/resource \ + -I${includedir}/c_common \ -I${svcincludedir}/resource-encapsulation \ -I${svcincludedir}/resource-container \ -I${svcincludedir}/resource-hosting \ diff --git a/resource/c_common/SConscript b/resource/c_common/SConscript index f412655..31f7eca 100644 --- a/resource/c_common/SConscript +++ b/resource/c_common/SConscript @@ -21,15 +21,120 @@ Import('env') import os +import datetime target_os = env.get('TARGET_OS') +target_arch = env.get('TARGET_ARCH') +###################################################################### +# Generate iotivity_config.h using presence of headers +###################################################################### + +config_h_env = env.Clone() +conf = Configure(config_h_env) + +config_h_header = ''' +/* **************************************************************************** + * iotivity_config.h - IoTivity platform-specific configuration header. + * + * Auto-generated code for the %s %s platform. + * + * Generated at %s + * + *************************************************************************** */ + +#ifndef IOTIVITY_CONFIG_H__ +#define IOTIVITY_CONFIG_H__ + +#include "platform_features.h" + +''' % (str(target_os), str(target_arch), str(datetime.datetime.utcnow())) + +config_h_body = '' + +config_h_footer = ''' + +#endif // IOTIVITY_CONFIG_H__ + +''' + +cxx_headers = ['arpa/inet.h', + 'fcntl.h', + 'grp.h', + 'in6addr.h', + 'linux/limits.h', + 'memory.h', + 'netdb.h', + 'netinet/in.h', + 'pthread.h', + 'pwd.h', + 'stdlib.h', + 'string.h', + 'strings.h', + 'sys/socket.h', + 'sys/stat.h', + 'sys/time.h', + 'sys/timeb.h', + 'sys/types.h', + 'sys/unistd.h', + 'syslog.h', + 'time.h', + 'unistd.h', + 'uuid/uuid.h', + 'windows.h', + 'winsock2.h', + 'ws2tcpip.h'] + +if target_os == 'arduino': + # Detection of headers on the Arduino platform is currently broken. + cxx_headers = [] + +if target_os == 'msys_nt': + # WinPThread provides a pthread.h, but we want to use native threads. + cxx_headers.remove('pthread.h') + +def get_define_from_header_file(header_file): + header_file_converted = header_file.replace("/","_").replace(".","_").upper() + return "HAVE_" + header_file_converted + +for header_file_name in cxx_headers: + if conf.CheckCXXHeader(header_file_name): + config_h_body += "#define %s\n\n" % get_define_from_header_file(header_file_name) +conf.Finish() + +# Autoconf feature doesn't work with Jenkins' arduino toolchain, so hardcode it here. +if target_os == 'arduino': + config_h_body += "#define HAVE_ARDUINO_TIME_H\n\n" + +# Generate the file +src_dir = env.get('SRC_DIR') +config_h_file_path = os.path.join(src_dir, 'resource', 'c_common', 'iotivity_config.h') +if os.path.exists(config_h_file_path): + os.remove(config_h_file_path) +config_h_file = open(config_h_file_path, "w") +config_h_file.write(config_h_header + config_h_body + config_h_footer) +config_h_file.close() + +# Sanity check to ensure that the above block created the file. +if not os.path.exists(config_h_file_path): + print "Error: iotivity_config.h file not created!" + +# iotivity_config.h should be copied to the build dir +env.UserInstallTargetHeader(config_h_file_path, 'c_common', 'iotivity_config.h') + +# Use the generated file internally +env.AppendUnique(CPPPATH = [os.path.join(src_dir, 'resource', 'c_common')]) + +###################################################################### + +###################################################################### # Add platform-specific helper library +###################################################################### + if target_os in ['windows', 'msys_nt']: SConscript('windows/SConscript') env.AppendUnique(CPPPATH = [ - os.path.join(Dir('.').abspath), os.path.join(Dir('.').abspath, 'oic_malloc', 'include'), os.path.join(Dir('.').abspath, 'oic_string', 'include'), os.path.join(Dir('.').abspath, 'oic_time', 'include'), @@ -45,7 +150,6 @@ if target_os in ['tizen', 'linux']: env.ParseConfig("pkg-config --cflags --libs uuid") common_env = env.Clone() -common_env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource')]) ###################################################################### # Build flags @@ -64,10 +168,9 @@ common_src = [ 'oic_time/src/oic_time.c', 'ocrandom/src/ocrandom.c', ] - commonlib = common_env.StaticLibrary('c_common', common_src) common_env.InstallTarget(commonlib, 'c_common') common_env.UserInstallTargetLib(commonlib, 'c_common') -common_env.UserInstallTargetHeader('platform_features.h', 'resource', 'platform_features.h') +common_env.UserInstallTargetHeader('platform_features.h', 'c_common', 'platform_features.h') env.PrependUnique(LIBS = ['c_common']) diff --git a/resource/c_common/ocrandom/src/ocrandom.c b/resource/c_common/ocrandom/src/ocrandom.c index 118aeee..32c4b4b 100644 --- a/resource/c_common/ocrandom/src/ocrandom.c +++ b/resource/c_common/ocrandom/src/ocrandom.c @@ -30,7 +30,8 @@ #define _POSIX_C_SOURCE 200809L #endif -#include "platform_features.h" +#include "iotivity_config.h" + #ifdef HAVE_FCNTL_H #include #endif diff --git a/resource/c_common/oic_time/src/oic_time.c b/resource/c_common/oic_time/src/oic_time.c index 0b094f5..e01e6fb 100644 --- a/resource/c_common/oic_time/src/oic_time.c +++ b/resource/c_common/oic_time/src/oic_time.c @@ -30,6 +30,7 @@ #define _POSIX_C_SOURCE 200809L #endif +#include "iotivity_config.h" #include "oic_time.h" #include // For NULL diff --git a/resource/c_common/windows/SConscript b/resource/c_common/windows/SConscript index a2e0e51..63ccb45 100644 --- a/resource/c_common/windows/SConscript +++ b/resource/c_common/windows/SConscript @@ -21,6 +21,9 @@ helper_src = [ static_libwinhelper = env.StaticLibrary('win_helper', helper_src) env.InstallTarget(static_libwinhelper, 'win_helper') env.UserInstallTargetLib(static_libwinhelper, 'win_helper') +env.UserInstallTargetHeader('include/win_sleep.h', 'c_common/windows/include', 'win_sleep.h') +env.UserInstallTargetHeader('include/pthread_create.h', 'c_common/windows/include', 'pthread_create.h') +env.UserInstallTargetHeader('include/vs12_snprintf.h', 'c_common/windows/include', 'vs12_snprintf.h') env.AppendUnique(LIBS = ['win_helper']) diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h index 87d1174..cedc763 100644 --- a/resource/csdk/connectivity/api/cacommon.h +++ b/resource/csdk/connectivity/api/cacommon.h @@ -26,6 +26,8 @@ #ifndef CA_COMMON_H_ #define CA_COMMON_H_ +#include "iotivity_config.h" + #ifndef WITH_ARDUINO #ifdef TCP_ADAPTER #define HAVE_SYS_POLL_H diff --git a/resource/csdk/connectivity/common/src/camutex_pthreads.c b/resource/csdk/connectivity/common/src/camutex_pthreads.c index db790ec..55f8536 100644 --- a/resource/csdk/connectivity/common/src/camutex_pthreads.c +++ b/resource/csdk/connectivity/common/src/camutex_pthreads.c @@ -36,6 +36,7 @@ #define _POSIX_C_SOURCE 200809L #endif +#include "iotivity_config.h" #ifdef HAVE_STRING_H #include #endif @@ -58,7 +59,6 @@ #include #include #include -#include "platform_features.h" #include "camutex.h" #include "logger.h" diff --git a/resource/csdk/connectivity/common/src/cathreadpool_pthreads.c b/resource/csdk/connectivity/common/src/cathreadpool_pthreads.c index d17af9c..3865df6 100644 --- a/resource/csdk/connectivity/common/src/cathreadpool_pthreads.c +++ b/resource/csdk/connectivity/common/src/cathreadpool_pthreads.c @@ -27,6 +27,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include "iotivity_config.h" #include #if defined HAVE_PTHREAD_H #include diff --git a/resource/csdk/connectivity/inc/caadapternetdtls.h b/resource/csdk/connectivity/inc/caadapternetdtls.h index 6d03c7e..dcc2366 100644 --- a/resource/csdk/connectivity/inc/caadapternetdtls.h +++ b/resource/csdk/connectivity/inc/caadapternetdtls.h @@ -20,7 +20,6 @@ #ifndef CA_ADAPTER_NET_DTLS_H_ #define CA_ADAPTER_NET_DTLS_H_ -#include "platform_features.h" #include "dtls.h" #include "uarraylist.h" #include "camutex.h" diff --git a/resource/csdk/connectivity/inc/caadapterutils.h b/resource/csdk/connectivity/inc/caadapterutils.h index 5f8c248..5c2dcc7 100644 --- a/resource/csdk/connectivity/inc/caadapterutils.h +++ b/resource/csdk/connectivity/inc/caadapterutils.h @@ -27,6 +27,8 @@ #ifndef CA_ADAPTER_UTILS_H_ #define CA_ADAPTER_UTILS_H_ +#include "iotivity_config.h" + #include #ifdef __ANDROID__ #include diff --git a/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c b/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c index f960fab..571878e 100644 --- a/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c +++ b/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c @@ -17,7 +17,7 @@ * limitations under the License. * ******************************************************************/ -#include "platform_features.h" +#include "iotivity_config.h" #include "caadapternetdtls.h" #include "cacommon.h" #include "caipinterface.h" diff --git a/resource/csdk/connectivity/src/adapter_util/caadapterutils.c b/resource/csdk/connectivity/src/adapter_util/caadapterutils.c index 888885b..8355886 100644 --- a/resource/csdk/connectivity/src/adapter_util/caadapterutils.c +++ b/resource/csdk/connectivity/src/adapter_util/caadapterutils.c @@ -18,6 +18,7 @@ * ******************************************************************/ +#include "iotivity_config.h" #include "caadapterutils.h" #include diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c index 03eca3b..94810ca 100644 --- a/resource/csdk/connectivity/src/caprotocolmessage.c +++ b/resource/csdk/connectivity/src/caprotocolmessage.c @@ -28,6 +28,7 @@ // Refer http://www.gnu.org/software/libc/manual/html_node/BSD-Random.html #define _DEFAULT_SOURCE +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/connectivity/src/caqueueingthread.c b/resource/csdk/connectivity/src/caqueueingthread.c index 3e10065..e034161 100644 --- a/resource/csdk/connectivity/src/caqueueingthread.c +++ b/resource/csdk/connectivity/src/caqueueingthread.c @@ -18,6 +18,7 @@ * ******************************************************************/ +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/connectivity/src/caretransmission.c b/resource/csdk/connectivity/src/caretransmission.c index a3cb02f..7101b4c 100644 --- a/resource/csdk/connectivity/src/caretransmission.c +++ b/resource/csdk/connectivity/src/caretransmission.c @@ -41,6 +41,7 @@ #define _POSIX_C_SOURCE 200809L #endif +#include "iotivity_config.h" #include #include #include @@ -55,7 +56,7 @@ #ifdef HAVE_SYS_TIME_H #include #endif -#if HAVE_SYS_TIMEB_H +#ifdef HAVE_SYS_TIMEB_H #include #endif #ifdef HAVE_TIME_H diff --git a/resource/csdk/connectivity/src/ip_adapter/caipserver.c b/resource/csdk/connectivity/src/ip_adapter/caipserver.c index 313d2f6..f953689 100644 --- a/resource/csdk/connectivity/src/ip_adapter/caipserver.c +++ b/resource/csdk/connectivity/src/ip_adapter/caipserver.c @@ -25,6 +25,7 @@ #define _GNU_SOURCE // for in6_pktinfo #endif +#include "iotivity_config.h" #include #if !defined(_WIN32) #include @@ -65,7 +66,6 @@ #include "camutex.h" #include "oic_malloc.h" #include "oic_string.h" -#include "platform_features.h" #define USE_IP_MREQN #if defined(_WIN32) diff --git a/resource/csdk/connectivity/test/camutex_tests.cpp b/resource/csdk/connectivity/test/camutex_tests.cpp index 54d9fb8..9a8e6f6 100644 --- a/resource/csdk/connectivity/test/camutex_tests.cpp +++ b/resource/csdk/connectivity/test/camutex_tests.cpp @@ -33,6 +33,7 @@ #define _POSIX_C_SOURCE 200809L #endif // _POSIX_C_SOURCE +#include "iotivity_config.h" #include "gtest/gtest.h" #include @@ -47,7 +48,6 @@ #ifdef HAVE_UNISTD_H #include #endif -#include "platform_features.h" #ifdef HAVE_WINDOWS_H #include #endif diff --git a/resource/csdk/connectivity/test/catests.cpp b/resource/csdk/connectivity/test/catests.cpp index c701a2e..69eaa14 100644 --- a/resource/csdk/connectivity/test/catests.cpp +++ b/resource/csdk/connectivity/test/catests.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include "gtest/gtest.h" #ifdef HAVE_PTHREAD_H diff --git a/resource/csdk/logger/src/logger.c b/resource/csdk/logger/src/logger.c index cc7f303..edeb167 100644 --- a/resource/csdk/logger/src/logger.c +++ b/resource/csdk/logger/src/logger.c @@ -30,6 +30,8 @@ #define _POSIX_C_SOURCE 200809L #endif +#include "iotivity_config.h" + // Pull in _POSIX_TIMERS feature test macro to check for // clock_gettime() support. #ifdef HAVE_UNISTD_H @@ -52,7 +54,6 @@ #include "logger.h" #include "string.h" #include "logger_types.h" -#include "platform_features.h" #ifndef __TIZEN__ static oc_log_ctx_t *logCtx = 0; diff --git a/resource/csdk/security/include/securevirtualresourcetypes.h b/resource/csdk/security/include/securevirtualresourcetypes.h index bc0efb4..77af258 100644 --- a/resource/csdk/security/include/securevirtualresourcetypes.h +++ b/resource/csdk/security/include/securevirtualresourcetypes.h @@ -41,14 +41,14 @@ #ifndef OC_SECURITY_RESOURCE_TYPES_H #define OC_SECURITY_RESOURCE_TYPES_H +#include "iotivity_config.h" + #include // for uint8_t typedef #include #if defined(__WITH_X509__) || defined(__WITH_TLS__) #include "byte_array.h" #endif /* __WITH_X509__ or __WITH_TLS__*/ -#include "platform_features.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/resource/csdk/security/provisioning/sample/provisioningclient.c b/resource/csdk/security/provisioning/sample/provisioningclient.c index b0454ee..c742e1b 100644 --- a/resource/csdk/security/provisioning/sample/provisioningclient.c +++ b/resource/csdk/security/provisioning/sample/provisioningclient.c @@ -18,13 +18,14 @@ * *****************************************************************/ +#include "iotivity_config.h" + #include #include #ifdef HAVE_UNISTD_H #include #endif -#include "platform_features.h" #include "utlist.h" #include "logger.h" #include "oic_malloc.h" diff --git a/resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp b/resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp index adec06f..fcf752d 100644 --- a/resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp +++ b/resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp @@ -20,6 +20,7 @@ /////////////////////////////////////////////////////////////////////// //NOTE : This sample server is generated based on ocserverbasicops.cpp /////////////////////////////////////////////////////////////////////// +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp b/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp index 06a5512..56156ba 100644 --- a/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp +++ b/resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp @@ -20,6 +20,7 @@ /////////////////////////////////////////////////////////////////////// //NOTE : This sample server is generated based on ocserverbasicops.cpp /////////////////////////////////////////////////////////////////////// +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c index 6499e03..eec02f3 100644 --- a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c +++ b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c @@ -30,6 +30,7 @@ #define _POSIX_C_SOURCE 200809L #endif +#include "iotivity_config.h" #ifdef HAVE_TIME_H #include #endif diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c index f679388..ee4c607 100755 --- a/resource/csdk/security/provisioning/src/pmutility.c +++ b/resource/csdk/security/provisioning/src/pmutility.c @@ -21,7 +21,8 @@ #define _POSIX_C_SOURCE 200112L #endif -#if HAVE_UNISTD_H +#include "iotivity_config.h" +#ifdef HAVE_UNISTD_H #include #endif #ifdef HAVE_STRING_H diff --git a/resource/csdk/security/provisioning/src/secureresourceprovider.c b/resource/csdk/security/provisioning/src/secureresourceprovider.c index 0b14334..fcf6536 100644 --- a/resource/csdk/security/provisioning/src/secureresourceprovider.c +++ b/resource/csdk/security/provisioning/src/secureresourceprovider.c @@ -17,6 +17,7 @@ * limitations under the License. * * *****************************************************************/ +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp index 92c67b7..14338f2 100644 --- a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp +++ b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp @@ -17,6 +17,7 @@ * limitations under the License. * * *****************************************************************/ +#include "iotivity_config.h" #include "gtest/gtest.h" #include "provisioningdatabasemanager.h" diff --git a/resource/csdk/security/src/aclresource.c b/resource/csdk/security/src/aclresource.c index 3aaefeb..450123f 100644 --- a/resource/csdk/security/src/aclresource.c +++ b/resource/csdk/security/src/aclresource.c @@ -18,9 +18,10 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #ifdef HAVE_STRING_H #include -#elif HAVE_STRINGS_H +#elif defined(HAVE_STRINGS_H) #include #endif #include diff --git a/resource/csdk/security/src/credresource.c b/resource/csdk/security/src/credresource.c index 2e2bba5..24371b8 100644 --- a/resource/csdk/security/src/credresource.c +++ b/resource/csdk/security/src/credresource.c @@ -20,6 +20,7 @@ #define __STDC_LIMIT_MACROS +#include "iotivity_config.h" #include #ifdef HAVE_STRING_H #include diff --git a/resource/csdk/security/src/directpairing.c b/resource/csdk/security/src/directpairing.c index e7ef882..af7cbad 100644 --- a/resource/csdk/security/src/directpairing.c +++ b/resource/csdk/security/src/directpairing.c @@ -20,6 +20,7 @@ #ifndef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200112L #endif +#include "iotivity_config.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c index 9aac585..44b22be 100644 --- a/resource/csdk/security/src/doxmresource.c +++ b/resource/csdk/security/src/doxmresource.c @@ -17,10 +17,11 @@ // limitations under the License. // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H #include #endif diff --git a/resource/csdk/security/src/dpairingresource.c b/resource/csdk/security/src/dpairingresource.c index 820021a..534dcea 100644 --- a/resource/csdk/security/src/dpairingresource.c +++ b/resource/csdk/security/src/dpairingresource.c @@ -18,6 +18,7 @@ * * *****************************************************************/ +#include "iotivity_config.h" #include #include #include "ocstack.h" diff --git a/resource/csdk/security/src/iotvticalendar.c b/resource/csdk/security/src/iotvticalendar.c index dc16f4b..acb44f1 100644 --- a/resource/csdk/security/src/iotvticalendar.c +++ b/resource/csdk/security/src/iotvticalendar.c @@ -22,6 +22,7 @@ #if !defined(WITH_ARDUINO) #define _XOPEN_SOURCE //Needed by strptime +#include "iotivity_config.h" #include #include "iotvticalendar.h" #include "oic_string.h" diff --git a/resource/csdk/security/src/pconfresource.c b/resource/csdk/security/src/pconfresource.c index 84bbf48..b216e62 100644 --- a/resource/csdk/security/src/pconfresource.c +++ b/resource/csdk/security/src/pconfresource.c @@ -18,6 +18,7 @@ * * *****************************************************************/ +#include "iotivity_config.h" #include #include #include "ocstack.h" diff --git a/resource/csdk/security/src/verresource.c b/resource/csdk/security/src/verresource.c index 96afacc..78725a7 100644 --- a/resource/csdk/security/src/verresource.c +++ b/resource/csdk/security/src/verresource.c @@ -18,10 +18,11 @@ * * *****************************************************************/ +#include "iotivity_config.h" #include #include -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H #include #endif diff --git a/resource/csdk/security/unittest/pstatresource.cpp b/resource/csdk/security/unittest/pstatresource.cpp index 90f189d..df46f27 100644 --- a/resource/csdk/security/unittest/pstatresource.cpp +++ b/resource/csdk/security/unittest/pstatresource.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/resource/csdk/security/unittest/securityresourcemanager.cpp b/resource/csdk/security/unittest/securityresourcemanager.cpp index 2917709..9a38f48 100644 --- a/resource/csdk/security/unittest/securityresourcemanager.cpp +++ b/resource/csdk/security/unittest/securityresourcemanager.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include "gtest/gtest.h" #ifdef HAVE_PWD_H #include diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h index 2ae83e4..5fafce2 100644 --- a/resource/csdk/stack/include/octypes.h +++ b/resource/csdk/stack/include/octypes.h @@ -28,7 +28,7 @@ #ifndef OCTYPES_H_ #define OCTYPES_H_ -#include "platform_features.h" +#include "iotivity_config.h" #include "ocstackconfig.h" #include #include diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp index fe7c8ae..061c94f 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include @@ -37,7 +38,6 @@ #include "ocpayload.h" #include "payload_logging.h" #include "common.h" -#include "platform_features.h" #ifdef ROUTING_GATEWAY /** diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp index 988ce35..a37f64a 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp @@ -17,6 +17,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp index 375b169..5e576b4 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp index d15fdd4..aa45b6c 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp index 970565a..68c592f 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp @@ -19,6 +19,7 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include @@ -41,7 +42,6 @@ #include "ocpayload.h" #include "ocserver.h" #include "common.h" -#include "platform_features.h" //string length of "/a/light/" + std::numeric_limits::digits10 + '\0'" // 9 + 9 + 1 = 19 diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp index 84d902c..e5726c4 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp index b5408d0..ed18975 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp @@ -19,6 +19,7 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include @@ -38,7 +39,6 @@ #include #include "ocpayload.h" #include "common.h" -#include "platform_features.h" #define TAG PCF("ocservercontainer") diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp index 5f0ba4b..997b789 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include diff --git a/resource/csdk/stack/samples/linux/secure/ocamsservice.cpp b/resource/csdk/stack/samples/linux/secure/ocamsservice.cpp index 4d0fdf0..e7262a8 100644 --- a/resource/csdk/stack/samples/linux/secure/ocamsservice.cpp +++ b/resource/csdk/stack/samples/linux/secure/ocamsservice.cpp @@ -1,5 +1,5 @@ - +#include "iotivity_config.h" #include #include #include @@ -13,7 +13,6 @@ #ifdef HAVE_PTHREAD_H #include #endif -#include "platform_features.h" #include "ocstack.h" #include "logger.h" #include "common.h" diff --git a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp index 714d075..5e8ca99 100644 --- a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include @@ -35,7 +36,6 @@ #include #include #include -#include "platform_features.h" #include "ocstack.h" #include "logger.h" #include "occlientbasicops.h" diff --git a/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp b/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp index af344d3..5ae096b 100644 --- a/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp +++ b/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include @@ -37,7 +38,6 @@ #undef ERROR #endif #endif // defined(HAVE_WINDOWS_H) -#include "platform_features.h" #include "ocstack.h" #include "logger.h" #include "ocpayload.h" diff --git a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp index 9d83669..61db06a 100644 --- a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp +++ b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include @@ -31,7 +32,6 @@ #ifdef HAVE_PTHREAD_H #include #endif -#include "platform_features.h" #include "ocstack.h" #include "logger.h" #include "ocpayload.h" diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec index 2bc78f8..4f65262 100644 --- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec +++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec @@ -67,6 +67,7 @@ cp resource/oc_logger/include/targets/oc_ostream_logger.h %{DEST_INC_DIR} cp resource/csdk/stack/include/ocpresence.h %{DEST_INC_DIR} cp resource/csdk/stack/include/ocpayload.h %{DEST_INC_DIR} cp resource/c_common/platform_features.h %{DEST_INC_DIR} +cp resource/c_common/iotivity_config.h %{DEST_INC_DIR} cp resource/c_common/*/include/*.h %{DEST_INC_DIR} cp resource/csdk/stack/include/payload_logging.h %{DEST_INC_DIR} cp resource/csdk/stack/include/rdpayload.h %{DEST_INC_DIR} diff --git a/resource/csdk/stack/src/occlientcb.c b/resource/csdk/stack/src/occlientcb.c index cc2bfb4..42100d6 100644 --- a/resource/csdk/stack/src/occlientcb.c +++ b/resource/csdk/stack/src/occlientcb.c @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= - +#include "iotivity_config.h" #include "occlientcb.h" #include "utlist.h" #include "logger.h" diff --git a/resource/csdk/stack/src/ocpayload.c b/resource/csdk/stack/src/ocpayload.c index 3af571e..80e9e06 100644 --- a/resource/csdk/stack/src/ocpayload.c +++ b/resource/csdk/stack/src/ocpayload.c @@ -21,6 +21,7 @@ // Required for strok_r #define _POSIX_C_SOURCE 200112L +#include "iotivity_config.h" #include #include "ocpayload.h" #include "octypes.h" diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c index e5323e6..860b27a 100755 --- a/resource/csdk/stack/src/ocresource.c +++ b/resource/csdk/stack/src/ocresource.c @@ -29,6 +29,7 @@ #define _GNU_SOURCE #endif +#include "iotivity_config.h" #ifdef HAVE_STRING_H #include #endif diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index 13d595b..f11501c 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -36,6 +36,7 @@ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS #endif +#include "iotivity_config.h" #include #include #include @@ -57,7 +58,6 @@ #include "cainterface.h" #include "ocpayload.h" #include "ocpayloadcbor.h" -#include "platform_features.h" #if defined (ROUTING_GATEWAY) || defined (ROUTING_EP) #include "routingutility.h" diff --git a/resource/csdk/stack/src/oicgroup.c b/resource/csdk/stack/src/oicgroup.c index 558f683..a2968cd 100755 --- a/resource/csdk/stack/src/oicgroup.c +++ b/resource/csdk/stack/src/oicgroup.c @@ -20,6 +20,8 @@ #define _POSIX_C_SOURCE 200112L +#include "iotivity_config.h" + #include #include "oicgroup.h" @@ -32,8 +34,6 @@ #include "logger.h" #include "timer.h" -#include "platform_features.h" - #define TAG "OIC_RI_GROUP" #define DESC_DELIMITER "\"" diff --git a/resource/csdk/stack/src/oicresourcedirectory.c b/resource/csdk/stack/src/oicresourcedirectory.c index 4a60a77..8920bde 100644 --- a/resource/csdk/stack/src/oicresourcedirectory.c +++ b/resource/csdk/stack/src/oicresourcedirectory.c @@ -17,6 +17,7 @@ // limitations under the License. // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include "oicresourcedirectory.h" #include "rdpayload.h" diff --git a/resource/examples/lightserver.cpp b/resource/examples/lightserver.cpp index 6368e93..1ce1e6b 100644 --- a/resource/examples/lightserver.cpp +++ b/resource/examples/lightserver.cpp @@ -23,6 +23,7 @@ /// This sample provides steps to define an interface for a resource /// (properties and methods) and host this resource on the server. /// +#include "iotivity_config.h" #ifdef HAVE_UNISTD_H #include diff --git a/resource/examples/presenceserver.cpp b/resource/examples/presenceserver.cpp index 5bb8b06..228e6af 100644 --- a/resource/examples/presenceserver.cpp +++ b/resource/examples/presenceserver.cpp @@ -23,9 +23,12 @@ /// (properties and methods) and host this resource on the server. /// +#include "iotivity_config.h" #include +#ifdef HAVE_PTHREAD_H #include +#endif #include #include #include @@ -36,7 +39,6 @@ #ifdef HAVE_WINDOWS_H #include #endif -#include "platform_features.h" using namespace OC; using namespace std; diff --git a/resource/examples/simpleclient.cpp b/resource/examples/simpleclient.cpp index f9452af..a2997bc 100644 --- a/resource/examples/simpleclient.cpp +++ b/resource/examples/simpleclient.cpp @@ -20,6 +20,7 @@ // OCClient.cpp : Defines the entry point for the console application. // +#include "iotivity_config.h" #ifdef HAVE_UNISTD_H #include #endif diff --git a/resource/examples/simpleclientHQ.cpp b/resource/examples/simpleclientHQ.cpp index be585fc..6d631d3 100644 --- a/resource/examples/simpleclientHQ.cpp +++ b/resource/examples/simpleclientHQ.cpp @@ -20,21 +20,22 @@ // OCClient.cpp : Defines the entry point for the console application. // +#include "iotivity_config.h" + #include #include #include -#ifdef HAVE_PTHREAD_H -#include -#endif #include #include #include "OCPlatform.h" #include "OCApi.h" +#if defined(HAVE_PTHREAD_H) +#include +#endif #if defined(HAVE_WINDOWS_H) #include #endif -#include "platform_features.h" using namespace OC; diff --git a/resource/examples/simpleserver.cpp b/resource/examples/simpleserver.cpp index 13981cb..b005900 100644 --- a/resource/examples/simpleserver.cpp +++ b/resource/examples/simpleserver.cpp @@ -22,8 +22,9 @@ /// This sample provides steps to define an interface for a resource /// (properties and methods) and host this resource on the server. /// -#include +#include "iotivity_config.h" +#include #ifdef HAVE_UNISTD_H #include #endif @@ -38,7 +39,6 @@ #ifdef HAVE_WINDOWS_H #include #endif -#include "platform_features.h" using namespace OC; using namespace std; diff --git a/resource/examples/simpleserverHQ.cpp b/resource/examples/simpleserverHQ.cpp index 3adef4e..6d641e7 100644 --- a/resource/examples/simpleserverHQ.cpp +++ b/resource/examples/simpleserverHQ.cpp @@ -23,6 +23,7 @@ /// (properties and methods) and host this resource on the server. /// +#include "iotivity_config.h" #include #ifdef HAVE_PTHREAD_H @@ -37,7 +38,6 @@ #ifdef HAVE_WINDOWS_H #include #endif -#include "platform_features.h" using namespace OC; using namespace std; diff --git a/resource/examples/threadingsample.cpp b/resource/examples/threadingsample.cpp index 1eaaeba..46cfbec 100644 --- a/resource/examples/threadingsample.cpp +++ b/resource/examples/threadingsample.cpp @@ -23,6 +23,7 @@ /// server in a separate thread, and running 2 clients in each thread. /// +#include "iotivity_config.h" #include #include @@ -37,7 +38,6 @@ #ifdef HAVE_WINDOWS_H #include #endif -#include "platform_features.h" using namespace OC; diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp index b83061f..9fd3d5b 100644 --- a/resource/src/OCResource.cpp +++ b/resource/src/OCResource.cpp @@ -18,6 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include "OCResource.h" #include "OCUtilities.h" -- 2.7.4