Fix type conflict
authorCaiwen Zhang <caiwen.zhang@intel.com>
Thu, 9 Oct 2014 21:08:25 +0000 (05:08 +0800)
committerCaiwen Zhang <caiwen.zhang@intel.com>
Thu, 9 Oct 2014 21:27:35 +0000 (05:27 +0800)
In address.h, coap_address_t is defined as OCDevAddr, it should be used
as coap_address_t not 'struct coap_address_t'

Change-Id: I110ebc2e7064dad6588d4b3ae7625a2edde58093

csdk/libcoap-4.1.1/debug.c
csdk/libcoap-4.1.1/debug.h

index fbe07d8..3a03806 100644 (file)
@@ -141,7 +141,7 @@ print_readable( const unsigned char *data, unsigned int len,
 #endif
 
 size_t
-coap_print_addr(const struct coap_address_t *addr, unsigned char *buf, size_t len) {
+coap_print_addr(const coap_address_t *addr, unsigned char *buf, size_t len) {
 TODO(FIX: Fix this)
     (void)addr;
     (void)buf;
index 7896f28..d599e1b 100644 (file)
@@ -70,11 +70,9 @@ void coap_log_impl(coap_log_t level, const char *format, ...);
 #include "pdu.h"
 void coap_show_pdu(const coap_pdu_t *);
 
-#ifdef WITH_ANDROID
-/* For the Android build, the compiler does not likes these declarations */
-struct coap_address_t;
-size_t coap_print_addr(const struct coap_address_t *, unsigned char *, size_t);
-#endif
+#include "address.h"
+size_t coap_print_addr(const coap_address_t *, unsigned char *, size_t);
+
 
 #else