Changeset 306f91c for lib

Timestamp:

06/27/06 14:04:37 (15 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

1e52a3c

Parents:

496864e

Message:

Fix problems with zlib in the new build environment

Location:

lib

Files:

• format_helper.c (modified) (1 diff)
• format_wag.c (modified) (1 diff)
• libtraceio.h (modified) (2 diffs)

lib/format_helper.c

@@ -196 +196 @@
         assert(level<10);
         assert(level>=0);
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
         sprintf(filemode,"wb%d",level);
 #else

lib/format_wag.c

@@ -161 +161 @@
                 void *value) {
         switch(option) {
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
                 case TRACE_OPTION_OUTPUT_COMPRESS:
                         OPTIONS.zlib.level = *(int*)value;

lib/libtraceio.h

@@ -5 +5 @@
 #define LIBTRACEIO_H 1
 #include "config.h"
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#else
-#include <stdio.h>
-#endif
+#include <inttypes.h>
 
 #include <unistd.h>
@@ -55 +51 @@
  */
 ssize_t libtrace_io_write(libtrace_io_t *io, const void *buf, size_t len);
-off_t libtrace_io_seek(libtrace_io_t *io, off_t offset, int whence);
+int64_t libtrace_io_seek(libtrace_io_t *io, int64_t offset, int whence);
 ssize_t libtrace_io_tell(libtrace_io_t *io);