X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=serialport.c;h=272bdf6013a525b96a30cd869ea3e99ca0ea0499;hb=ad036cc8efcdcae5d2b8727996108c38c4915d2b;hp=b8ddffe870e1e1fa4c2269471d78a6cbfb185195;hpb=8d12e620f255ef44da8d0c7ee810a7b3bcaf8807;p=libserialport.git

diff --git a/serialport.c b/serialport.c
index b8ddffe..272bdf6 100644
--- a/serialport.c
+++ b/serialport.c
@@ -136,7 +136,7 @@ SP_API char *sp_get_port_description(struct sp_port *port)
 	RETURN_STRING(port->description);
 }
 
-SP_API enum sp_transport sp_get_port_transport(struct sp_port *port)
+SP_API enum sp_transport sp_get_port_transport(const struct sp_port *port)
 {
 	TRACE("%p", port);
 
@@ -322,8 +322,10 @@ fail:
 
 SP_API enum sp_return sp_list_ports(struct sp_port ***list_ptr)
 {
+#ifndef NO_ENUMERATION
 	struct sp_port **list;
 	int ret;
+#endif
 
 	TRACE("%p", list_ptr);
 
@@ -1165,11 +1167,12 @@ static enum sp_return add_handle(struct sp_event_set *event_set,
 			sizeof(event_handle) * (event_set->count + 1))))
 		RETURN_ERROR(SP_ERR_MEM, "Handle array realloc() failed");
 
+	event_set->handles = new_handles;
+
 	if (!(new_masks = realloc(event_set->masks,
 			sizeof(enum sp_event) * (event_set->count + 1))))
 		RETURN_ERROR(SP_ERR_MEM, "Mask array realloc() failed");
 
-	event_set->handles = new_handles;
 	event_set->masks = new_masks;
 
 	((event_handle *) event_set->handles)[event_set->count] = handle;