You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by st...@apache.org on 2016/12/18 21:57:00 UTC
[32/50] incubator-mynewt-core git commit: oic;
surround OIC client only function prototypes with an appropriate
#ifdef.
oic; surround OIC client only function prototypes with an
appropriate #ifdef.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/ec77b345
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ec77b345
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ec77b345
Branch: refs/heads/sensors_branch
Commit: ec77b345b90e1083477195b628006c6ef5f73e8b
Parents: 0a07efd
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue Dec 13 10:14:09 2016 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Sun Dec 18 13:56:16 2016 -0800
----------------------------------------------------------------------
net/oic/include/oic/oc_api.h | 2 ++
net/oic/include/oic/oc_client_state.h | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ec77b345/net/oic/include/oic/oc_api.h
----------------------------------------------------------------------
diff --git a/net/oic/include/oic/oc_api.h b/net/oic/include/oic/oc_api.h
index ca512e4..e7438e7 100644
--- a/net/oic/include/oic/oc_api.h
+++ b/net/oic/include/oic/oc_api.h
@@ -109,6 +109,7 @@ void oc_send_separate_response(oc_separate_response_t *handle,
int oc_notify_observers(oc_resource_t *resource);
+#ifdef OC_CLIENT
/** Client side */
#include "oc_client_state.h"
@@ -136,6 +137,7 @@ bool oc_do_observe(const char *uri, oc_server_handle_t *server,
oc_qos_t qos);
bool oc_stop_observe(const char *uri, oc_server_handle_t *server);
+#endif
#ifdef __cplusplus
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ec77b345/net/oic/include/oic/oc_client_state.h
----------------------------------------------------------------------
diff --git a/net/oic/include/oic/oc_client_state.h b/net/oic/include/oic/oc_client_state.h
index dd6308d..5897117 100644
--- a/net/oic/include/oic/oc_client_state.h
+++ b/net/oic/include/oic/oc_client_state.h
@@ -25,6 +25,7 @@
extern "C" {
#endif
+#ifdef OC_CLIENT
typedef enum { HIGH_QOS = 0, LOW_QOS } oc_qos_t;
typedef struct
@@ -88,6 +89,7 @@ oc_discovery_flags_t oc_ri_process_discovery_payload(uint8_t *payload, int len,
bool oc_ri_send_rst(oc_endpoint_t *endpoint, uint8_t *token, uint8_t token_len,
uint16_t mid);
+#endif
#ifdef __cplusplus
}