projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.0.0
[platform/upstream/iotivity.git]
/
service
/
things-manager
/
sampleapp
/
tizen
/
ConServerApp
/
inc
/
conserverapp.h
diff --git
a/service/things-manager/sampleapp/tizen/ConServerApp/inc/conserverapp.h
b/service/things-manager/sampleapp/tizen/ConServerApp/inc/conserverapp.h
index
2950d70
..
8f35f69
100644
(file)
--- a/
service/things-manager/sampleapp/tizen/ConServerApp/inc/conserverapp.h
+++ b/
service/things-manager/sampleapp/tizen/ConServerApp/inc/conserverapp.h
@@
-18,8
+18,8
@@
*
******************************************************************/
*
******************************************************************/
-#ifndef
__
CONSERVERAPP_H__
-#define
__
CONSERVERAPP_H__
+#ifndef CONSERVERAPP_H__
+#define CONSERVERAPP_H__
#include <app.h>
#include <Elementary.h>
#include <app.h>
#include <Elementary.h>
@@
-29,7
+29,6
@@
#include "OCPlatform.h"
#include "OCApi.h"
#include "OCPlatform.h"
#include "OCApi.h"
-#include "thingsmanager.h"
#ifdef LOG_TAG
#undef LOG_TAG
#ifdef LOG_TAG
#undef LOG_TAG
@@
-42,4
+41,4
@@
#define ELM_DEMO_EDJ "opt/usr/apps/org.tizen.conserverapp/res/ui_controls.edj"
#define ELM_DEMO_EDJ "opt/usr/apps/org.tizen.conserverapp/res/ui_controls.edj"
-#endif // __CONSERVERAPP_H__
+#endif // CONSERVERAPP_H__
\ No newline at end of file