Revise the include guards of header files

[Version] 0.1.33
[Issue Type] Improvement

Change-Id: Id2c23b3614d29506f1d8773cd21c76079700e707
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/doc/mediastreamer_doc.h b/doc/mediastreamer_doc.h
index 5f553c1..1084bda 100755 (executable)
--- a/doc/mediastreamer_doc.h
+++ b/doc/mediastreamer_doc.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __TIZEN_MEDIASTREAMER_DOC_H__
-#define __TIZEN_MEDIASTREAMER_DOC_H__
+#ifndef __TIZEN_MEDIA_STREAMER_DOC_H__
+#define __TIZEN_MEDIA_STREAMER_DOC_H__
 
 /**
  * @file mediastreamer_doc.h
@@ -57,4 +57,4 @@
  *
  */
 
-#endif  /* __TIZEN_MEDIASTREAMER_DOC_H__ */
+#endif  /* __TIZEN_MEDIA_STREAMER_DOC_H__ */

diff --git a/include/media_streamer.h b/include/media_streamer.h
index 592fb3c..236d2cf 100644 (file)
--- a/include/media_streamer.h
+++ b/include/media_streamer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __TIZEN_MULTIMEDIA_MEDIA_STREAMER_H__
-#define __TIZEN_MULTIMEDIA_MEDIA_STREAMER_H__
+#ifndef __TIZEN_MEDIA_STREAMER_H__
+#define __TIZEN_MEDIA_STREAMER_H__
 
 #include <tizen.h>
 #include <bundle.h>
@@ -24,7 +24,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
 /**
 * @file media_streamer.h
@@ -1265,6 +1265,6 @@ int media_streamer_node_get_param(media_streamer_node_h node,
 
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif
 
-#endif /* __TIZEN_MULTIMEDIA_MEDIA_STREAMER_H__ */
+#endif /* __TIZEN_MEDIA_STREAMER_H__ */

diff --git a/include/media_streamer_gst.h b/include/media_streamer_gst.h
index a1669e1..3653cd4 100644 (file)
--- a/include/media_streamer_gst.h
+++ b/include/media_streamer_gst.h
@@ -14,9 +14,16 @@
  * limitations under the License.
  */
 
+#ifndef __TIZEN_MEDIA_STREAMER_GST_H__
+#define __TIZEN_MEDIA_STREAMER_GST_H__
+
 #include <gst/gst.h>
 #include "media_streamer_priv.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DOT_FILE_NAME "streamer"
 
 #define MEDIA_STREAMER_PIPELINE_NAME "media-streamer-pipeline"
@@ -295,3 +302,9 @@ int __ms_demux_element_prepare(media_streamer_s *ms_streamer, media_streamer_nod
  * @since_tizen 3.0
  */
 int __ms_find_type(media_streamer_s *ms_streamer, GstElement *src_element);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIZEN_MEDIA_STREAMER_GST_H__ */
\ No newline at end of file

diff --git a/include/media_streamer_http_server.h b/include/media_streamer_http_server.h
index d7855dd..0308138 100644 (file)
--- a/include/media_streamer_http_server.h
+++ b/include/media_streamer_http_server.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
@@ -15,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __MEDIA_STREAMER_HTTP_H__
-#define __MEDIA_STREAMER_HTTP_H__
+#ifndef __TIZEN_MEDIA_STREAMER_HTTP_SERVER_H__
+#define __TIZEN_MEDIA_STREAMER_HTTP_SERVER_H__
 
 #include "media_streamer.h"
 
@@ -39,4 +38,4 @@ int __ms_http_server_unregister_uri(media_streamer_http_server_h server, char *u
 }
 #endif
 
-#endif /* __MEDIA_STREAMER_HTTP_H__ */
+#endif /* __TIZEN_MEDIA_STREAMER_HTTP_SERVER_H__ */

diff --git a/include/media_streamer_node.h b/include/media_streamer_node.h
index b2d13d1..b3bfbe4 100644 (file)
--- a/include/media_streamer_node.h
+++ b/include/media_streamer_node.h
@@ -14,8 +14,15 @@
  * limitations under the License.
  */
 
+#ifndef __TIZEN_MEDIA_STREAMER_NODE_H__
+#define __TIZEN_MEDIA_STREAMER_NODE_H__
+
 #include "media_streamer_priv.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Gets Node's information by its type.
  *
@@ -117,3 +124,9 @@ int __ms_node_set_pad_format(media_streamer_node_s *node, const char *pad_name,
 gboolean _ms_node_resources_acquire_iter(const GValue *item, GValue *ret, gpointer user_data);
 gboolean  _ms_node_resources_release_iter(const GValue *item, GValue *ret, gpointer user_data);
 gboolean _ms_node_policy_check_iter(const GValue *item, GValue *ret, gpointer user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIZEN_MEDIA_STREAMER_NODE_H__ */
\ No newline at end of file

diff --git a/include/media_streamer_node_policy.h b/include/media_streamer_node_policy.h
index 61fd37b..827d578 100644 (file)
--- a/include/media_streamer_node_policy.h
+++ b/include/media_streamer_node_policy.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __MEDIA_STREAMER_NODE_POLICY_H__
-#define __MEDIA_STREAMER_NODE_POLICY_H__
+#ifndef __TIZEN_MEDIA_STREAMER_NODE_POLICY_H__
+#define __TIZEN_MEDIA_STREAMER_NODE_POLICY_H__
 
 #include "media_streamer_priv.h"
 
@@ -37,4 +37,4 @@ int _ms_node_policy_check(media_streamer_node_s *node);
 }
 #endif
 
-#endif /* __MEDIA_STREAMER_NODE_POLICY_H__ */
+#endif /* __TIZEN_MEDIA_STREAMER_NODE_POLICY_H__ */

diff --git a/include/media_streamer_node_resources.h b/include/media_streamer_node_resources.h
index e63b7dd..1dcd011 100644 (file)
--- a/include/media_streamer_node_resources.h
+++ b/include/media_streamer_node_resources.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __MEDIA_STREAMER_NODE_RESOURCE_H__
-#define __MEDIA_STREAMER_NODE_RESOURCE_H__
+#ifndef __TIZEN_MEDIA_STREAMER_NODE_RESOURCE_H__
+#define __TIZEN_MEDIA_STREAMER_NODE_RESOURCE_H__
 
 #include "media_streamer_priv.h"
 
@@ -30,4 +30,4 @@ int _ms_node_resource_release(media_streamer_node_s *node);
 }
 #endif
 
-#endif /* __MEDIA_STREAMER_NODE_RESOURCE_H__ */
+#endif /* __TIZEN_MEDIA_STREAMER_NODE_RESOURCE_H__ */

diff --git a/include/media_streamer_priv.h b/include/media_streamer_priv.h
index c977c2d..5f040df 100644 (file)
--- a/include/media_streamer_priv.h
+++ b/include/media_streamer_priv.h
@@ -14,13 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __TIZEN_MEDIASTREAMER_PRIVATE_H__
-#define __TIZEN_MEDIASTREAMER_PRIVATE_H__
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#ifndef __TIZEN_MEDIA_STREAMER_PRIVATE_H__
+#define __TIZEN_MEDIA_STREAMER_PRIVATE_H__
 
 #include <gst/gst.h>
 #include <stdio.h>
@@ -30,6 +25,10 @@ extern "C" {
 #include "media_streamer_util.h"
 #include "media_streamer_http_server.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct media_streamer_node_s;
 
 /**
@@ -197,7 +196,6 @@ int __ms_release_resources(media_streamer_s *ms_streamer);
 
 #ifdef __cplusplus
 }
-
 #endif /* __cplusplus */
 
-#endif /* __TIZEN_MEDIASTREAMER_PRIVATE_H__ */
+#endif /* __TIZEN_MEDIA_STREAMER_PRIVATE_H__ */

diff --git a/include/media_streamer_util.h b/include/media_streamer_util.h
index 369dea9..5d104bb 100644 (file)
--- a/include/media_streamer_util.h
+++ b/include/media_streamer_util.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __MEDIA_STREAMER_UTIL_H__
-#define __MEDIA_STREAMER_UTIL_H__
+#ifndef __TIZEN_MEDIA_STREAMER_UTIL_H__
+#define __TIZEN_MEDIA_STREAMER_UTIL_H__
 
 #include <media_format.h>
 
@@ -344,4 +344,4 @@ int __ms_bin_foreach_elements(GstBin *bin, GstIteratorFoldFunction func, void *u
 }
 #endif
 
-#endif
+#endif /* __TIZEN_MEDIA_STREAMER_UTIL_H__ */

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index b562437..7941314 100644 (file)
--- a/packaging/capi-media-streamer.spec
+++ b/packaging/capi-media-streamer.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer API
-Version:    0.1.32
+Version:    0.1.33
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0