Prefix CONTAINER_OF with UC_

test/ortp-send-simple.c

@@ -43,7 +43,7 @@ int diffts(const struct timespec *a, struct timespec *b)
 
 void timer_cb(struct UCTimers *timers, struct UCTimer *timer)
 {
-    struct RTPSender *s = CONTAINER_OF(timer, struct RTPSender, timer);   
+    struct RTPSender *s = UC_CONTAINER_OF(timer, struct RTPSender, timer);   
     int rc;
     ssize_t r;
     struct timespec ts;

test/test_containerof.c

@@ -25,7 +25,7 @@ START_TEST (test_container_of)
     };
 
     struct Inner *innerp = &outer.inner;
-    struct Outer *outerp = CONTAINER_OF(innerp, struct Outer, inner);
+    struct Outer *outerp = UC_CONTAINER_OF(innerp, struct Outer, inner);
 
     fail_if(outerp != &outer);
 

test/timers.c

@@ -22,7 +22,7 @@ void t2_cb(struct UCTimers *timers, struct UCTimer *timer)
 
 void mystruct1_cb(struct UCTimers *timers, struct UCTimer *timer)
 {
-    struct MyStruct *mystruct = CONTAINER_OF(timer, struct MyStruct, timer);
+    struct MyStruct *mystruct = UC_CONTAINER_OF(timer, struct MyStruct, timer);
 
     TRACEF("MyStruct1 timer: %s\n", mystruct->str);
     uc_timers_add(timers, timer, 1, 0);

test/udp_heartbeat.c

@@ -70,7 +70,7 @@ void peer_do_state(struct HBPeer *peer, enum PeerEvent event);
 
 void peer_timer_cb(struct UCTimers *timers, struct UCTimer *timer)
 {
-    struct HBPeer *peer = CONTAINER_OF(timer, struct HBPeer, timer);
+    struct HBPeer *peer = UC_CONTAINER_OF(timer, struct HBPeer, timer);
     struct HBContext *ctx = timer->cookie_ptr;
     time_t now;
 
@@ -181,7 +181,7 @@ void peer_received(struct HBPeer *peer)
 
 void  hb_read(struct IOMux *mux, struct IOMuxFD *fd, unsigned int event)
 {
-    struct HBContext *ctx = CONTAINER_OF(fd, struct HBContext, sock_fd);
+    struct HBContext *ctx = UC_CONTAINER_OF(fd, struct HBContext, sock_fd);
     ssize_t rc;
     struct sockaddr_in peer_addr;
     socklen_t peer_len = sizeof peer_addr;