summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
Diffstat (limited to 'service')
-rw-r--r--[-rwxr-xr-x]service/easy-setup/enrollee/src/samsung/sc_easysetup.c5
-rw-r--r--service/notification/src/provider/NSProviderCallbackResponse.c2
-rw-r--r--service/notification/src/provider/NSProviderMemoryCache.c3
-rw-r--r--service/notification/src/provider/NSProviderMemoryCache.h4
-rw-r--r--service/notification/src/provider/NSProviderSubscription.c2
-rw-r--r--service/notification/src/provider/NSProviderSubscription.h2
-rw-r--r--service/notification/src/provider/NSProviderTopic.c3
-rw-r--r--service/notification/src/provider/NSProviderTopic.h4
8 files changed, 14 insertions, 11 deletions
diff --git a/service/easy-setup/enrollee/src/samsung/sc_easysetup.c b/service/easy-setup/enrollee/src/samsung/sc_easysetup.c
index 5c7a2e3b0..e86e1b92e 100755..100644
--- a/service/easy-setup/enrollee/src/samsung/sc_easysetup.c
+++ b/service/easy-setup/enrollee/src/samsung/sc_easysetup.c
@@ -37,11 +37,6 @@
*/
#define SC_ENROLLEE_TAG "ES_SC_ENROLLEE"
-EasySetupResource g_ESEasySetupResource;
-WiFiConfResource g_ESWiFiConfResource;
-CoapCloudConfResource g_ESCoapCloudConfResource;
-DevConfResource g_ESDevConfResource;
-
SCProperties g_SCProperties;
static void ReadAccountData(OCRepPayload* payload,void** userdata);
diff --git a/service/notification/src/provider/NSProviderCallbackResponse.c b/service/notification/src/provider/NSProviderCallbackResponse.c
index e702bab13..2902df04e 100644
--- a/service/notification/src/provider/NSProviderCallbackResponse.c
+++ b/service/notification/src/provider/NSProviderCallbackResponse.c
@@ -34,7 +34,7 @@
static NSSubscribeRequestCallback g_subscribeRequestCb = NULL;
static NSProviderSyncInfoCallback g_syncCb = NULL;
-pthread_mutex_t nsInitMutex;
+extern pthread_mutex_t nsInitMutex;
void NSRegisterSubscribeRequestCb(NSSubscribeRequestCallback subscribeRequestCb)
{
diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c
index 9e4dd6935..484f6238d 100644
--- a/service/notification/src/provider/NSProviderMemoryCache.c
+++ b/service/notification/src/provider/NSProviderMemoryCache.c
@@ -34,6 +34,9 @@
} \
}
+pthread_mutex_t NSCacheMutex;
+pthread_mutexattr_t NSCacheMutexAttr;
+
NSCacheList * NSProviderStorageCreate()
{
pthread_mutex_lock(&NSCacheMutex);
diff --git a/service/notification/src/provider/NSProviderMemoryCache.h b/service/notification/src/provider/NSProviderMemoryCache.h
index df2733d97..05440f811 100644
--- a/service/notification/src/provider/NSProviderMemoryCache.h
+++ b/service/notification/src/provider/NSProviderMemoryCache.h
@@ -57,7 +57,7 @@ bool NSProviderIsTopicSubScribed(NSCacheElement * conTopicList, char * cId, char
NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList,
NSCacheTopicSubData * topicSubData);
-pthread_mutex_t NSCacheMutex;
-pthread_mutexattr_t NSCacheMutexAttr;
+extern pthread_mutex_t NSCacheMutex;
+extern pthread_mutexattr_t NSCacheMutexAttr;
#endif /* _NS_PROVIDER_CACHEADAPTER__H_ */
diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 3116cbb4f..3d01f3edf 100644
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -21,6 +21,8 @@
#include "NSProviderSubscription.h"
#include "NSProviderListener.h"
+NSCacheList * consumerSubList;
+
NSResult NSInitSubscriptionList()
{
NS_LOG(DEBUG, "NSInitSubscriptionList - IN");
diff --git a/service/notification/src/provider/NSProviderSubscription.h b/service/notification/src/provider/NSProviderSubscription.h
index dd112731c..89acd5ea8 100644
--- a/service/notification/src/provider/NSProviderSubscription.h
+++ b/service/notification/src/provider/NSProviderSubscription.h
@@ -34,7 +34,7 @@
#include "oic_malloc.h"
#include <stdbool.h>
-NSCacheList * consumerSubList;
+extern NSCacheList * consumerSubList;
NSResult NSInitSubscriptionList();
NSResult NSSetSubscriptionAccessPolicy(bool policy);
diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 055dc47b3..f6aa8e941 100644
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -23,6 +23,9 @@
#include "oic_malloc.h"
#include <pthread.h>
+NSCacheList * consumerTopicList;
+NSCacheList * registeredTopicList;
+
NSResult NSSendTopicUpdation();
NSResult NSInitTopicList()
diff --git a/service/notification/src/provider/NSProviderTopic.h b/service/notification/src/provider/NSProviderTopic.h
index f75a1f58c..5c858454b 100644
--- a/service/notification/src/provider/NSProviderTopic.h
+++ b/service/notification/src/provider/NSProviderTopic.h
@@ -42,8 +42,8 @@ typedef struct {
NSResult result;
} NSTopicSyncResult;
-NSCacheList * consumerTopicList;
-NSCacheList * registeredTopicList;
+extern NSCacheList * consumerTopicList;
+extern NSCacheList * registeredTopicList;
NSResult NSInitTopicList();
NSTopicList * NSGetTopics(char *consumerId);