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>
Fri, 16 Sep 2016 22:31:46 +0000 (22:31 +0000)
commit4c49d8fbd634398f5f16addb9331a4683b939068
tree1bc05a2f1b41c30ab35bf3245c141c309477dd2c
parent7aa1b42a203764ede322d70596ed0b86eb4751e4
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>
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