Update code to remove SAM violation (GV, PP)

Change-Id: I11345dc1eb6433c91ade42b28321d7354e236bc0

diff --git a/svc/daemon/media_controller_main.c b/svc/daemon/media_controller_main.c
index 614a33d..5c33a49 100644 (file)
--- a/svc/daemon/media_controller_main.c
+++ b/svc/daemon/media_controller_main.c
@@ -23,7 +23,7 @@
 #include "media_controller_svc.h"
 #include "media_controller_cynara.h"
 
-GMainLoop *g_mc_mainloop = NULL;
+static GMainLoop *g_mc_mainloop = NULL;
 
 #ifdef _ON_DEMAND_SOCKET_ACTIVATION
 static int g_mc_timer_id = 0;

diff --git a/svc/media_controller_cynara.c b/svc/media_controller_cynara.c
index db50a4e..d99302c 100755 (executable)
--- a/svc/media_controller_cynara.c
+++ b/svc/media_controller_cynara.c
@@ -32,10 +32,6 @@
 #include <cynara-error.h>
 #include <cynara-creds-socket.h>
 
-/* this definition is missing in glibc headers (version 2.21). It was introduced in kernel version 2.6.17 */
-#ifndef SCM_SECURITY
-#define SCM_SECURITY 0x03
-#endif
 
 static cynara *_cynara = NULL;
 G_LOCK_DEFINE_STATIC(cynara_mutex);