IOT-1072 Unfork libcoap: update forked headers
authorDave Thaler <dthaler@microsoft.com>
Wed, 13 Jul 2016 22:24:11 +0000 (15:24 -0700)
committerDave Thaler <dthaler@microsoft.com>
Sat, 17 Sep 2016 01:11:30 +0000 (01:11 +0000)
commit6f6cc44d431d20dee1bcbb0e379bde5fa19e84fc
tree1900f9ff8cccb559e54a22132415944ca9a938de
parent1a06bd70ae5f6842dae31c1b50976f65feb60595
IOT-1072 Unfork libcoap: update forked headers

Make the .h files compatible between the forked libcoap and the official
libcoap, so that no breaking changes (only additions) are done to the
official libcoap, which other projects depend on the current
types/prototypes in.

Make any additions (that are beyond the official libcoap, but that are
already used by IoTivity code) to libcoap .h files follow the conventions of
libcoap, to make it more likely they'll be accepted back into the upstream
libcoap.  E.g., coap_transport_type -> coap_transport_t, etc.

Leaving WITH_UPSTREAM_LIBCOAP off by default on all OS's in this change.
Turning it on by default in certain OS's will be done as part of a
separate change.

Change-Id: I373ef818b8aeb7608c5e3511dc9880047946fbe0
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
(cherry picked from commit 4c49d8fbd634398f5f16addb9331a4683b939068)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11891
31 files changed:
extlibs/libcoap/SConscript
extlibs/tinydtls/tinydtls.h
resource/csdk/connectivity/inc/caprotocolmessage.h
resource/csdk/connectivity/inc/catcpinterface.h
resource/csdk/connectivity/lib/libcoap-4.1.1/async.c
resource/csdk/connectivity/lib/libcoap-4.1.1/block.c
resource/csdk/connectivity/lib/libcoap-4.1.1/debug.c
resource/csdk/connectivity/lib/libcoap-4.1.1/include/coap/option.h
resource/csdk/connectivity/lib/libcoap-4.1.1/include/coap/pdu.h
resource/csdk/connectivity/lib/libcoap-4.1.1/net.c
resource/csdk/connectivity/lib/libcoap-4.1.1/option.c
resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c
resource/csdk/connectivity/lib/libcoap-4.1.1/resource.c
resource/csdk/connectivity/lib/libcoap-4.1.1/subscribe.c
resource/csdk/connectivity/src/SConscript
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrclient.c
resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.cpp
resource/csdk/connectivity/src/cablockwisetransfer.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/caprotocolmessage.c
resource/csdk/connectivity/src/ra_adapter/caraadapter.c
resource/csdk/connectivity/src/tcp_adapter/arduino/catcpserver_eth.cpp
resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/connectivity/test/cablocktransfertest.cpp
resource/csdk/connectivity/test/caprotocolmessagetest.cpp
resource/csdk/stack/include/octypes.h
resource/csdk/stack/src/occlientcb.c
resource/csdk/stack/src/ocstack.c
run.bat