Commit 12fa4016 authored by Habib Virji's avatar Habib Virji Committed by Randeep

[IOT-1460] Remove cbor.h dependency

Patch removes cbor.h by removing it from ocpayload.h. It is now moved
to ocpayloadcbor.h.

https://jira.iotivity.org/browse/IOT-1460

Change-Id: I23ae035804840a327e2764ed64559b82247ab8e8
Signed-off-by: default avatarHabib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13659Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent 7827b3a8
......@@ -22,6 +22,7 @@
#include <string.h>
#include "oic_malloc.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "payload_logging.h"
#include "psinterface.h"
#include "resourcemanager.h"
......
......@@ -40,6 +40,7 @@
#include "oic_malloc.h"
#include "oic_string.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "utlist.h"
#include "credresource.h"
#include "doxmresource.h"
......
......@@ -26,6 +26,7 @@
#include "srmutility.h"
#include "doxmresource.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "oic_malloc.h"
#include "oic_string.h"
#include "crlresource.h"
......
......@@ -35,6 +35,7 @@
#include "utlist.h"
#include "ocrandom.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "cainterface.h"
#include "ocserverrequest.h"
#include "resourcemanager.h"
......
......@@ -39,10 +39,10 @@
#include "aclresource.h"
#include "srmutility.h"
#include "ocserverrequest.h"
#include "ocpayloadcbor.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "payload_logging.h"
#include <stdlib.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
......
......@@ -28,6 +28,7 @@
#include "cJSON.h"
#include "base64.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "payload_logging.h"
#include "resourcemanager.h"
#include "pconfresource.h"
......@@ -37,7 +38,6 @@
#include "doxmresource.h"
#include "srmutility.h"
#include "ocserverrequest.h"
#include <stdlib.h>
#include "psinterface.h"
#include "security_internals.h"
#ifdef HAVE_STRINGS_H
......
......@@ -24,6 +24,7 @@
#include "ocstack.h"
#include "oic_malloc.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "payload_logging.h"
#include "resourcemanager.h"
#include "pstatresource.h"
......
......@@ -22,6 +22,7 @@
#include "ocstack.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "oic_malloc.h"
#include "utlist.h"
#include "payload_logging.h"
......
......@@ -32,6 +32,7 @@
#include "logger.h"
#include "payload_logging.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "cainterface.h"
#include "ocserverrequest.h"
#include "resourcemanager.h"
......
......@@ -22,6 +22,7 @@
#define OC_PAYLOAD_CBOR_H
#include "octypes.h"
#include <cbor.h>
#ifdef __cplusplus
extern "C"
......
......@@ -31,7 +31,6 @@
#include <stdbool.h>
#include <inttypes.h>
#include "octypes.h"
#include <cbor.h>
#if defined(__WITH_TLS__) || defined(__WITH_DTLS__)
#include "securevirtualresourcetypes.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment