[xiph-commits] r3625 - liboggz/trunk/src/tools/oggz-chop

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-07-04 02:47:18 -0700 (Fri, 04 Jul 2008)
New Revision: 3625

Modified:
   liboggz/trunk/src/tools/oggz-chop/Makefile.am
   liboggz/trunk/src/tools/oggz-chop/httpdate_test.c
   liboggz/trunk/src/tools/oggz-chop/oggz-chop.c
Log:
build fixes (to pass 'make distcheck')


Modified: liboggz/trunk/src/tools/oggz-chop/Makefile.am
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/Makefile.am	2008-07-04 07:23:10 UTC (rev 3624)
+++ liboggz/trunk/src/tools/oggz-chop/Makefile.am	2008-07-04 09:47:18 UTC (rev 3625)
@@ -2,6 +2,7 @@
 
 INCLUDES = -I$(top_builddir) -I$(top_builddir)/include \
            -I$(top_srcdir)/include -I$(top_srcdir)/src/tools \
+           -I$(top_srcdir)/src/tests \
            @OGG_CFLAGS@
 
 OGGZDIR = ../../liboggz
@@ -24,7 +25,7 @@
 
 noinst_HEADERS = cgi.h cmd.h header.h httpdate.h oggz-chop.h timespec.h
 
-oggz_chop_SOURCES = oggz-chop.c ../oggz_tools.c ../skeleton.c \
+oggz_chop_SOURCES = oggz-chop.c $(srcdir)/../oggz_tools.c $(srcdir)/../skeleton.c \
                     cmd.c cgi.c header.c httpdate.c main.c timespec.c
 oggz_chop_LDADD = $(OGGZ_LIBS) -lm
 

Modified: liboggz/trunk/src/tools/oggz-chop/httpdate_test.c
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/httpdate_test.c	2008-07-04 07:23:10 UTC (rev 3624)
+++ liboggz/trunk/src/tools/oggz-chop/httpdate_test.c	2008-07-04 09:47:18 UTC (rev 3625)
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 
 #include "oggz_tests.h"
 

Modified: liboggz/trunk/src/tools/oggz-chop/oggz-chop.c
===================================================================
--- liboggz/trunk/src/tools/oggz-chop/oggz-chop.c	2008-07-04 07:23:10 UTC (rev 3624)
+++ liboggz/trunk/src/tools/oggz-chop/oggz-chop.c	2008-07-04 09:47:18 UTC (rev 3625)
@@ -168,12 +168,12 @@
 }
 
 static void
-_ogg_page_set_eos (const ogg_page * og)
+_ogg_page_set_eos (ogg_page * og)
 {
   if (og == NULL) return;
 
   og->header[5] |= 0x04;
-  ogg_page_checksum_set (OGG_PAGE_CONST(og));
+  ogg_page_checksum_set (og);
 }
 
 static void
@@ -571,7 +571,7 @@
     fwrite_ogg_page (state->outfile, og);
   } else if (state->end != -1.0 && page_time > state->end) {
     /* This is the first page past the end time; set EOS */
-    _ogg_page_set_eos (og);
+    _ogg_page_set_eos ((ogg_page *)og);
     fwrite_ogg_page (state->outfile, og);
 
     /* Stop handling this track */