Commit 98b92dae authored by Philippe Coval's avatar Philippe Coval Committed by Uze Choi

easy-setup: Rename header to EasySetup.hpp

Prevent potential name clash on case insensitive filesystems:

./service/easy-setup/mediator/richsdk/inc/EasySetup.h
./service/easy-setup/enrollee/inc/easysetup.h

Mediator one is C++ so we rename it to .hpp

Change-Id: I6d784378b5065b162d06abb2338bf70e0147d864
Signed-off-by: default avatarPhilippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16479Reviewed-by: George Nash's avatarGeorge Nash <george.nash@intel.com>
Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
parent 6a89e64d
......@@ -27,7 +27,7 @@
#include "OCApi.h"
#include "oic_malloc.h"
#include "EasySetup.h"
#include "EasySetup.hpp"
#include "ESRichCommon.h"
#include "ocrandom.h"
......
......@@ -145,7 +145,7 @@ if target_os in ['android','linux']:
easy_setup_env.InstallTarget([es_sdk_shared, es_sdk_static], 'libESMediatorRich')
easy_setup_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libESMediatorRich.so'])
filenames = [ 'ESRichCommon.h', 'EasySetup.h', 'RemoteEnrollee.h' ]
filenames = [ 'ESRichCommon.h', 'EasySetup.hpp', 'RemoteEnrollee.h' ]
for filename in filenames:
easy_setup_env.UserInstallTargetHeader('inc/' + filename, "service/easy-setup", filename)
......
......@@ -28,7 +28,7 @@
#include <jni.h>
#include "EasySetup.h"
#include "EasySetup.hpp"
#include "RemoteEnrollee.h"
#include "ESException.h"
#include "oic_string.h"
......@@ -57,4 +57,4 @@ Java_org_iotivity_service_easysetup_mediator_EasySetup_nativeCreateRemoteEnrolle
#ifdef __cplusplus
}
#endif
#endif // __JNI_ES_EASYSETUP_H
\ No newline at end of file
#endif // __JNI_ES_EASYSETUP_H
......@@ -18,8 +18,8 @@
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#ifndef EASYSETUP_H_
#define EASYSETUP_H_
#ifndef EASYSETUP_HPP_
#define EASYSETUP_HPP_
#include <memory>
#include <vector>
......@@ -75,4 +75,4 @@ namespace OIC
}
}
#endif /* EASYSETUP_H_ */
#endif /* EASYSETUP_HPP_ */
......@@ -18,7 +18,7 @@
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#include "EasySetup.h"
#include "EasySetup.hpp"
#include "OCPlatform.h"
#include "logger.h"
......
......@@ -29,7 +29,7 @@
#include "ESEnrolleeSimulator.h"
#include "escommon.h"
#include "ESRichCommon.h"
#include "EasySetup.h"
#include "EasySetup.hpp"
#include "RemoteEnrollee.h"
#include "ESEnrolleeCommon.h"
......
......@@ -26,7 +26,7 @@
#include "OCProvisioningManager.hpp"
#include "securevirtualresourcetypes.h"
#include "EasySetup.h"
#include "EasySetup.hpp"
#include "ESRichCommon.h"
#define ES_SAMPLE_APP_TAG "ES_SAMPLE_APP_TAG"
......
......@@ -26,7 +26,7 @@
#include "OCProvisioningManager.hpp"
#include "securevirtualresourcetypes.h"
#include "EasySetup.h"
#include "EasySetup.hpp"
#include "ESRichCommon.h"
#define ES_SAMPLE_APP_TAG "ES_SAMPLE_APP_TAG"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment