merge from master branch's latest code.

[apps/core/preloaded/ciss.git] / include / ciss-converter.h

diff --git a/include/ciss-converter.h b/include/ciss-converter.h
index b5e3cb1..d284c51 100644 (file)
--- a/include/ciss-converter.h
+++ b/include/ciss-converter.h
@@ -14,12 +14,8 @@
  * limitations under the License.\r
  */\r
 \r
-#ifndef _CISS_CONVERTER_MMI_H_\r
-#define _CISS_CONVERTER_MMI_H_\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif /* __cplusplus */\r
+#ifndef _CISS_CONVERTER_H_\r
+#define _CISS_CONVERTER_H_\r
 \r
 #include "ciss-common.h"\r
 #include <glib.h>\r
@@ -117,7 +113,7 @@ typedef enum {
 \r
 \r
 typedef struct {\r
-       char*                   local_sc;       /* local value of Service Code */\r
+       char                    *local_sc;      /* local value of Service Code */\r
        unsigned char           tapi_flavor;    /* TAPI flavor */\r
        unsigned char           ss_type;        /* barring, fwding, waiting, etc*/\r
 } sc_table_element_type;\r
@@ -182,5 +178,6 @@ void _ciss_ui_mmi_get_service_name(ciss_service_t in_service, char *service_name
 void _ciss_ui_mmi_get_flavor_name(ciss_flavor_t in_flavor, char *flavor_name);\r
 void _ciss_ui_mmi_get_bearer_name(ciss_service_t ss_type, ciss_telecomm_svc_t in_teleservice, char *teleservice_name);\r
 void _ciss_ui_mmi_get_result_status_type(ciss_service_t ss_type, ciss_status_t result_status, char *szResult);\r
-#endif /* _CISS_CONVERTER_MMI_H_ */\r
+\r
+#endif /* _CISS_CONVERTER_H_ */\r
 \r