From: Philippe Coval <philippe.coval@osg.samsung.com>
Date: Wed, 21 Sep 2016 10:26:49 +0000 (+0200)
Subject: coap-http-proxy: Fix coap headers path
X-Git-Tag: 1.3.0~1054^2~110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83cd441c539bcec9fc010bd6eb20b11d5f1fa943;p=platform%2Fupstream%2Fiotivity.git

coap-http-proxy: Fix coap headers path

It failed to build on Tizen:2.3.1:Wearable

Change-Id: I1069ab17f11a946605093454b89205a6c208c902
Origin: https://gerrit.iotivity.org/gerrit/#/c/12061/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini  Kumar <k.ashwini@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12487
---

diff --git a/service/coap-http-proxy/SConscript b/service/coap-http-proxy/SConscript
index a44d0c1..ea73450 100644
--- a/service/coap-http-proxy/SConscript
+++ b/service/coap-http-proxy/SConscript
@@ -43,7 +43,7 @@ src_dir = env.get('SRC_DIR')
 local_env.AppendUnique(CPPPATH = ['include',
                         os.path.join(src_dir, 'resource/csdk/stack/include'),
                         os.path.join(src_dir, 'resource/csdk/connectivity/common/inc/'),
-                        os.path.join(src_dir, 'resource/csdk/connectivity/lib/libcoap-4.1.1/include/coap/'),
+                        os.path.join(src_dir, 'resource/csdk/connectivity/lib/libcoap-4.1.1/include'),
                         os.path.join(src_dir, 'extlibs/cjson'),
 		])
 local_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap'])
diff --git a/service/coap-http-proxy/src/CoapHttpHandler.c b/service/coap-http-proxy/src/CoapHttpHandler.c
index 0d9624c..688d780 100644
--- a/service/coap-http-proxy/src/CoapHttpHandler.c
+++ b/service/coap-http-proxy/src/CoapHttpHandler.c
@@ -22,7 +22,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "logger.h"
-#include "pdu.h"
+#include <coap/pdu.h>
 #include "ocpayload.h"
 #include "uarraylist.h"
 #include "CoapHttpParser.h"
diff --git a/service/coap-http-proxy/src/CoapHttpMap.c b/service/coap-http-proxy/src/CoapHttpMap.c
index 82252a7..2712a81 100644
--- a/service/coap-http-proxy/src/CoapHttpMap.c
+++ b/service/coap-http-proxy/src/CoapHttpMap.c
@@ -24,7 +24,7 @@
 #include "oic_string.h"
 #include "logger.h"
 #include "ocstack.h"
-#include "pdu.h"
+#include <coap/pdu.h>
 #include "ocpayload.h"
 
 #define TAG "CHPMap"