removed extern "C" for error template with C linkage

Signed-off-by: Dongkyun, Son <dongkyun.s@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6660ce..35a5760 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,6 @@ SET(CMAKE_CXX_FLAGS_RELEASE    "-g -O2 ${CXX_SPECIFIC_FLAGS}")
 SET(CMAKE_C_FLAGS_CCOV         "${CMAKE_C_FLAGS_RELEASE} --coverage")
 SET(CMAKE_CXX_FLAGS_CCOV       "${CMAKE_CXX_FLAGS_RELEASE} --coverage")
 
-ADD_DEFINITIONS("-fPIC")
-
 # Set compiler warning flags
 ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
 ADD_DEFINITIONS("-Wall")                        # Generate all warnings

diff --git a/include/drm-tizen-error.h b/include/drm-tizen-error.h
index 91f15a0..45cc181 100644 (file)
--- a/include/drm-tizen-error.h
+++ b/include/drm-tizen-error.h
@@ -17,11 +17,6 @@
 #ifndef __DRM_TIZEN_ERROR_H__
 #define __DRM_TIZEN_ERROR_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 #define                TADC_SUCCESS                                    1                               // SUCCESS
 // TADC Error Message Define
 #define                TADC_GETDUID_ERROR                              0x0611                  // Get IMEI Error
@@ -87,9 +82,5 @@ extern "C" {
 #define                TADC_LICENSE_DUID_MISMATCH              0x806
 #define                TADC_LICENSE_UNKNOWN_ERROR              0x807
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif // __DRM_TIZEN_ERROR_H__
 

diff --git a/include/drm-tizen-mid.h b/include/drm-tizen-mid.h
index 39d6275..a497a1c 100644 (file)
--- a/include/drm-tizen-mid.h
+++ b/include/drm-tizen-mid.h
@@ -22,10 +22,6 @@
 #ifndef __DRM_TIZEN_MID_H__
 #define __DRM_TIZEN_MID_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
@@ -52,8 +48,4 @@ extern "C" {
 #define DRM_TAPPS_SECURE_LOG(FMT, ARG...)        SECURE_SLOGI(FMT, ##ARG)
 #define DRM_TAPPS_SECURE_EXCEPTION(FMT, ARG...)  SECURE_SLOGE(FMT, ##ARG)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __DRM_TIZEN_MID_H__*/

diff --git a/service/drm-tapps.cpp b/service/drm-tapps.cpp
index cb7472d..e1ca88a 100644 (file)
--- a/service/drm-tapps.cpp
+++ b/service/drm-tapps.cpp
@@ -66,10 +66,6 @@ DrmTappsProf::~DrmTappsProf()
 #define DRM_TAPPS_API_TIME()
 #endif /* __DRM_TAPPS_API_TIME_PROFILING__ */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Define EXPORT_API */
 #ifndef EXPORT_API
 #define EXPORT_API __attribute__((visibility("default")))
@@ -419,7 +415,3 @@ int _drm_tapps_generate_purchase_request
                return 1;
        }
 }
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tadcore/include/CPointerArray.h b/tadcore/include/CPointerArray.h
index a279382..c853171 100644 (file)
--- a/tadcore/include/CPointerArray.h
+++ b/tadcore/include/CPointerArray.h
@@ -27,10 +27,6 @@
 
 #include "TadcTypes.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 class CPointerArray
 {
 protected:
@@ -49,9 +45,5 @@ public:
        inline void                     RemoveAll() { m_nNumOfData = 0; }
 };
 
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
 #endif // !defined(AFX_CPOINTERARRAY_H__AB67E4BE_A233_4E3E_B257_9830D90326EE__INCLUDED_)
 #endif /* __CPOINTERARRAY_H__ */

diff --git a/tadcore/include/DUIDGenerator.h b/tadcore/include/DUIDGenerator.h
index 1327de4..60cf459 100644 (file)
--- a/tadcore/include/DUIDGenerator.h
+++ b/tadcore/include/DUIDGenerator.h
@@ -18,12 +18,4 @@
  * @file               DUIDGenerator.h
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int get_duid(char **duid);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/tadcore/include/DrmTdcSvc.h b/tadcore/include/DrmTdcSvc.h
index e105fb3..3d0a75b 100644 (file)
--- a/tadcore/include/DrmTdcSvc.h
+++ b/tadcore/include/DrmTdcSvc.h
@@ -23,10 +23,6 @@
 #ifndef DRMTDCSVC_H
 #define DRMTDCSVC_H
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 #include "TADC_Core.h"
 
 
@@ -187,8 +183,4 @@ void DrmTdcDHInfoInit(void);
 //DrmTdcDHInfo Structure Free
 bool DrmTdcDHInfoFree(int idx);
 
-#ifdef  __cplusplus
-}
-#endif
-
 #endif

diff --git a/tappsd/inc/DTapps2Base64.h b/tappsd/inc/DTapps2Base64.h
index 2741427..8996736 100644 (file)
--- a/tappsd/inc/DTapps2Base64.h
+++ b/tappsd/inc/DTapps2Base64.h
@@ -22,18 +22,10 @@
 #ifndef __DTAPPS_BASE64_H__
 #define __DTAPPS_BASE64_H__
 
-#ifdef __cplusplus
-        extern "C" {
-#endif
-
 #include "drm_intf_tapps.h"
 
 BOOL DTappsB64Encode(unsigned char* in, int in_size, unsigned char* out, int out_size);
 int DTappsB64Decode(unsigned char* in, int in_size, unsigned char* out, int& out_size);
 
-#ifdef __cplusplus
-}
-#endif
-
 
 #endif /*__DTAPPS_BASE64_H__ */

diff --git a/tappsd/inc/DTapps2HMAC.h b/tappsd/inc/DTapps2HMAC.h
index 3cac56b..e7c50ac 100644 (file)
--- a/tappsd/inc/DTapps2HMAC.h
+++ b/tappsd/inc/DTapps2HMAC.h
@@ -22,18 +22,10 @@
 #ifndef __DTAPPS_HMAC_H__
 #define __DTAPPS_HMAC_H__
 
-#ifdef __cplusplus
-        extern "C" {
-#endif
-
 #include "drm_intf_tapps.h"
 
 void DTappsCalHMACSHA1(unsigned char* key,int key_len,unsigned char* msg,size_t msglen,unsigned char *md,unsigned int *md_len);
 int DTappsGetDeviceKey(unsigned char **pDevKey,unsigned int *DevKeyLen);
 void DTappsFreeDeviceKey(unsigned char **pDevKey);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /*__DTAPPS_HMAC_H__ */

diff --git a/tappsd/inc/DTapps2Rights.h b/tappsd/inc/DTapps2Rights.h
index 66a8e71..d8b1288 100644 (file)
--- a/tappsd/inc/DTapps2Rights.h
+++ b/tappsd/inc/DTapps2Rights.h
@@ -22,10 +22,6 @@
 #ifndef __DTAPPS_RIGHTS_H__
 #define __DTAPPS_RIGHTS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "drm_intf_tapps.h"
 
 #define DTAPPS_NAME_SIZE       512
@@ -89,8 +85,4 @@ BOOL DTapps_RIGHTS_INSTALL(const char* name,
 
 BOOL DTapps_RIGHTS_SELECT_ONE(const char* cid, DTAPPS_RIGHTS_ROW* row);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /*__DTAPPS_RIGHTS_H__ */

diff --git a/tappsd/inc/DTapps2SqliteDB.h b/tappsd/inc/DTapps2SqliteDB.h
index 4e434d9..c36cb9e 100644 (file)
--- a/tappsd/inc/DTapps2SqliteDB.h
+++ b/tappsd/inc/DTapps2SqliteDB.h
@@ -22,10 +22,6 @@
 #ifndef __DTAPPS_SQLITE_DB_H__
 #define __DTAPPS_SQLITE_DB_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "TADC_Core.h"
 #include "drm_intf_tapps.h"
 
@@ -60,8 +56,4 @@ int DTappsStmtRelease (void* pStmt);
 BOOL DTapps_DB_Install(const char* sql_query);
 BOOL DTapps_Read_DB(const char* sql_query, TAPPSSqliteSelectTable* select_table);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /*__DTAPPS_SQLITE_DB_H__ */

diff --git a/tappsd/inc/DTapps2Time.h b/tappsd/inc/DTapps2Time.h
index 4a3ec33..6bbae62 100644 (file)
--- a/tappsd/inc/DTapps2Time.h
+++ b/tappsd/inc/DTapps2Time.h
@@ -22,18 +22,10 @@
 #ifndef __DTAPPS_TIME_H__
 #define __DTAPPS_TIME_H__
 
-#ifdef __cplusplus
-         extern "C" {
-#endif
-
 #include "drm_intf_tapps.h"
 
 BOOL DTappsDtTmStr2Sec(unsigned char *time_str,time_t *TotalSec);
 BOOL DTappsDtTmStr2StrucTm(unsigned char *time_str,struct tm *time_fmt);
 BOOL DTappsGetSecureTime(time_t* seconds);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /*__DTAPPS_TIME_H__ */

diff --git a/tappsd/inc/drm_intf_tapps.h b/tappsd/inc/drm_intf_tapps.h
index e86df0c..fa67522 100644 (file)
--- a/tappsd/inc/drm_intf_tapps.h
+++ b/tappsd/inc/drm_intf_tapps.h
@@ -22,10 +22,6 @@
 #ifndef __DRM_INTF_TAPPS_H__
 #define __DRM_INTF_TAPPS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
@@ -237,8 +233,4 @@ void dtapps_sleep(unsigned int TimeInSec,unsigned int TimeInMicroSec);
 #define DTAPPS_AES_UNWRAP_KEY AES_unwrap_key
 
 /*************************************************************************************************************/
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __DRM_INTF_TAPPS_H__ */