Index: /trunk/ChangeLog
===================================================================
--- /trunk/ChangeLog	(revision 514)
+++ /trunk/ChangeLog	(revision 515)
@@ -29,8 +29,15 @@
 ##
 
-- Version 2.0.25 (unreleased)
+- Version 2.0.25
 	* updated rtclient_read_packet to be compatible with new rt protocol
 	* rtclient input now correctly ignores packets with type = RT_MSG
 	* erf_write_packet now deals with rxerrors appropriately
+	* building without zlib support should now work properly; stdin 
+	  still doesn't work nicely in this case however
+	* build fixes for openbsd
+	* local lt_inttypes.h generated for PRIu64 macros etc
+	* setting __attribute__((packed)) on all structs
+	* build fixes for tracereport and testing for libgdc
+
 
 - Version 2.0.24 
Index: /trunk/lib/format_erf.c
===================================================================
--- /trunk/lib/format_erf.c	(revision 514)
+++ /trunk/lib/format_erf.c	(revision 515)
@@ -674,5 +674,7 @@
 			// Need to skip this packet as it is a message packet
 			tracefifo_out_update(libtrace->fifo, packet->size);
-			tracefifo_ack_update(libtrace->fifo, packet->size + (sizeof(uint32_t) * 2));
+			tracefifo_ack_update(libtrace->fifo, packet->size + 
+					sizeof(uint32_t) + 
+					sizeof(libtrace_packet_status_t));
 			continue;
 		}
@@ -691,5 +693,7 @@
 		tracefifo_out_update(libtrace->fifo,packet->size);
 
-		tracefifo_ack_update(libtrace->fifo,packet->size + (sizeof(uint32_t) * 2));
+		tracefifo_ack_update(libtrace->fifo,packet->size + 
+				sizeof(uint32_t) + 
+				sizeof(libtrace_packet_status_t));
 
 		//packet->size = numbytes;
Index: /trunk/lib/libtrace.h
===================================================================
--- /trunk/lib/libtrace.h	(revision 514)
+++ /trunk/lib/libtrace.h	(revision 515)
@@ -87,4 +87,12 @@
 typedef struct libtrace_filter_t libtrace_filter_t;
 
+/** Structure holding status information for a packet */
+typedef struct libtrace_packet_status {
+	uint8_t type;
+	uint8_t reserved;
+	uint16_t message;
+
+} libtrace_packet_status_t;
+
 /** Structure holding information about a packet */
 #define LIBTRACE_PACKET_BUFSIZE 65536
@@ -94,9 +102,5 @@
 	char buffer[LIBTRACE_PACKET_BUFSIZE];
 	size_t size;
-	struct {
-		uint8_t type;
-		uint8_t reserved;
-		uint16_t message;
- 	} status;
+	libtrace_packet_status_t status;
 } __attribute__ ((packed)) libtrace_packet_t;