Commit b2401e04 authored by conrad's avatar conrad

moved compatability stuff to oggz_compat.h and generalized header checks

(eg. using HAVE_UNISTD_H rather than just ifndef WIN32)


git-svn-id: http://svn.annodex.net/liboggz/trunk@355 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent cf2c623b
...@@ -34,7 +34,7 @@ AC_TYPE_SIZE_T ...@@ -34,7 +34,7 @@ AC_TYPE_SIZE_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_REALLOC AC_FUNC_REALLOC
AC_CHECK_FUNCS([memmove]) AC_CHECK_FUNCS([memmove random])
# Check for doxygen # Check for doxygen
......
...@@ -59,19 +59,12 @@ PRE_UNINSTALL = : ...@@ -59,19 +59,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
host_alias = @host_alias@ host_alias = @host_alias@
host_triplet = @host@ host_triplet = @host@
AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
ECHO = @ECHO@ ECHO = @ECHO@
EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
GETOPT_LIBS = @GETOPT_LIBS@ GETOPT_LIBS = @GETOPT_LIBS@
HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@
HAVE_DOCBOOKTOMAN = @HAVE_DOCBOOKTOMAN@ HAVE_DOCBOOKTOMAN = @HAVE_DOCBOOKTOMAN@
...@@ -88,7 +81,6 @@ OGG_CFLAGS = @OGG_CFLAGS@ ...@@ -88,7 +81,6 @@ OGG_CFLAGS = @OGG_CFLAGS@
OGG_LIBS = @OGG_LIBS@ OGG_LIBS = @OGG_LIBS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RC = @RC@
SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@
STRIP = @STRIP@ STRIP = @STRIP@
...@@ -123,9 +115,9 @@ GZIP_ENV = --best ...@@ -123,9 +115,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
...@@ -198,6 +190,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ...@@ -198,6 +190,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = doc subdir = doc
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<tr><td class="indexkey"><a class="el" href="oggz__constants_8h.html">oggz_constants.h</a> <a href="oggz__constants_8h-source.html">[code]</a></td><td class="indexvalue">General constants used by liboggz </td></tr> <tr><td class="indexkey"><a class="el" href="oggz__constants_8h.html">oggz_constants.h</a> <a href="oggz__constants_8h-source.html">[code]</a></td><td class="indexvalue">General constants used by liboggz </td></tr>
<tr><td class="indexkey"><a class="el" href="oggz__table_8h.html">oggz_table.h</a> <a href="oggz__table_8h-source.html">[code]</a></td><td class="indexvalue">A lookup table </td></tr> <tr><td class="indexkey"><a class="el" href="oggz__table_8h.html">oggz_table.h</a> <a href="oggz__table_8h-source.html">[code]</a></td><td class="indexvalue">A lookup table </td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -74,7 +74,7 @@ Here is a list of all documented functions, variables, defines, enums, and typed ...@@ -74,7 +74,7 @@ Here is a list of all documented functions, variables, defines, enums, and typed
: <a class="el" href="oggz_8h.html#a0">oggz.h</a><li>OggzTable : <a class="el" href="oggz_8h.html#a0">oggz.h</a><li>OggzTable
: <a class="el" href="oggz__table_8h.html#a0">oggz_table.h</a><li>OggzWriteHungry : <a class="el" href="oggz__table_8h.html#a0">oggz_table.h</a><li>OggzWriteHungry
: <a class="el" href="oggz_8h.html#a0">oggz.h</a></ul> : <a class="el" href="oggz_8h.html#a0">oggz.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
: <a class="el" href="oggz__constants_8h.html#a27">oggz_constants.h</a><li>OggzFlags : <a class="el" href="oggz__constants_8h.html#a27">oggz_constants.h</a><li>OggzFlags
: <a class="el" href="oggz__constants_8h.html#a25">oggz_constants.h</a><li>OggzFlushOpts : <a class="el" href="oggz__constants_8h.html#a25">oggz_constants.h</a><li>OggzFlushOpts
: <a class="el" href="oggz__constants_8h.html#a26">oggz_constants.h</a></ul> : <a class="el" href="oggz__constants_8h.html#a26">oggz_constants.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
: <a class="el" href="oggz__constants_8h.html#a25a2">oggz_constants.h</a><li>OGGZ_READ : <a class="el" href="oggz__constants_8h.html#a25a2">oggz_constants.h</a><li>OGGZ_READ
: <a class="el" href="oggz__constants_8h.html#a25a0">oggz_constants.h</a><li>OGGZ_WRITE : <a class="el" href="oggz__constants_8h.html#a25a0">oggz_constants.h</a><li>OGGZ_WRITE
: <a class="el" href="oggz__constants_8h.html#a25a1">oggz_constants.h</a></ul> : <a class="el" href="oggz__constants_8h.html#a25a1">oggz_constants.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
: <a class="el" href="oggz_8h.html#a5">oggz.h</a><li>oggz_write_output() : <a class="el" href="oggz_8h.html#a5">oggz.h</a><li>oggz_write_output()
: <a class="el" href="oggz_8h.html#a3">oggz.h</a><li>oggz_write_set_hungry_callback() : <a class="el" href="oggz_8h.html#a3">oggz.h</a><li>oggz_write_set_hungry_callback()
: <a class="el" href="oggz_8h.html#a1">oggz.h</a></ul> : <a class="el" href="oggz_8h.html#a1">oggz.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
: <a class="el" href="oggz_8h.html#a0">oggz.h</a><li>OggzTable : <a class="el" href="oggz_8h.html#a0">oggz.h</a><li>OggzTable
: <a class="el" href="oggz__table_8h.html#a0">oggz_table.h</a><li>OggzWriteHungry : <a class="el" href="oggz__table_8h.html#a0">oggz_table.h</a><li>OggzWriteHungry
: <a class="el" href="oggz_8h.html#a0">oggz.h</a></ul> : <a class="el" href="oggz_8h.html#a0">oggz.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -147,7 +147,7 @@ This introduction to the Ogg format is derived from IETF <a href="http://www.iet ...@@ -147,7 +147,7 @@ This introduction to the Ogg format is derived from IETF <a href="http://www.iet
<table border=0 cellpadding=0 cellspacing=0> <table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr> <tr><td></td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -27,7 +27,7 @@ If you are not using GNU autoconf in your project, you can use the pkg-config to ...@@ -27,7 +27,7 @@ If you are not using GNU autoconf in your project, you can use the pkg-config to
<table border=0 cellpadding=0 cellspacing=0> <table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr> <tr><td></td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -21,7 +21,7 @@ Configuring with <em>--disable-read</em> will remove all support for reading:<ul ...@@ -21,7 +21,7 @@ Configuring with <em>--disable-read</em> will remove all support for reading:<ul
<table border=0 cellpadding=0 cellspacing=0> <table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr> <tr><td></td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -84,7 +84,7 @@ main (<span class="keywordtype">int</span> argc, <span class="keywordtype">char< ...@@ -84,7 +84,7 @@ main (<span class="keywordtype">int</span> argc, <span class="keywordtype">char<
<table border=0 cellpadding=0 cellspacing=0> <table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr> <tr><td></td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -89,7 +89,7 @@ main (<span class="keywordtype">int</span> argc, <span class="keywordtype">char< ...@@ -89,7 +89,7 @@ main (<span class="keywordtype">int</span> argc, <span class="keywordtype">char<
<table border=0 cellpadding=0 cellspacing=0> <table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr> <tr><td></td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -194,7 +194,7 @@ operates. ...@@ -194,7 +194,7 @@ operates.
<table border=0 cellpadding=0 cellspacing=0> <table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr> <tr><td></td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -39,7 +39,7 @@ This impacts seeking because the portion of the bitstream containing decode head ...@@ -39,7 +39,7 @@ This impacts seeking because the portion of the bitstream containing decode head
<table border=0 cellpadding=0 cellspacing=0> <table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr> <tr><td></td></tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -249,7 +249,7 @@ It is safe to call this callback from within an OggzReadPacket function, in orde ...@@ -249,7 +249,7 @@ It is safe to call this callback from within an OggzReadPacket function, in orde
</td> </td>
</tr> </tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -417,7 +417,7 @@ Provide the file offset in bytes corresponding to the data read. ...@@ -417,7 +417,7 @@ Provide the file offset in bytes corresponding to the data read.
</td> </td>
</tr> </tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -393,7 +393,7 @@ Set a callback for Oggz to call when <em>oggz</em> is <a class="el" href="group_ ...@@ -393,7 +393,7 @@ Set a callback for Oggz to call when <em>oggz</em> is <a class="el" href="group_
</td> </td>
</tr> </tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -58,7 +58,7 @@ liboggz is provided under the following BSD-style open source license:<p> ...@@ -58,7 +58,7 @@ liboggz is provided under the following BSD-style open source license:<p>
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by </pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<li><a class="el" href="group__metric.html">Using OggzMetric</a> <li><a class="el" href="group__metric.html">Using OggzMetric</a>
<li><a class="el" href="group__seek__api.html">OGGZ Seek API</a> <li><a class="el" href="group__seek__api.html">OGGZ Seek API</a>
</ul> </ul>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:57 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
This diff is collapsed.
...@@ -28,6 +28,7 @@ Headers</a></h2> ...@@ -28,6 +28,7 @@ Headers</a></h2>
<code>#include &lt;ogg/ogg.h&gt;</code><br> <code>#include &lt;ogg/ogg.h&gt;</code><br>
<code>#include &lt;<a class="el" href="oggz__constants_8h-source.html">oggz/oggz_constants.h</a>&gt;</code><br> <code>#include &lt;<a class="el" href="oggz__constants_8h-source.html">oggz/oggz_constants.h</a>&gt;</code><br>
<code>#include &lt;<a class="el" href="oggz__table_8h-source.html">oggz/oggz_table.h</a>&gt;</code><br> <code>#include &lt;<a class="el" href="oggz__table_8h-source.html">oggz/oggz_table.h</a>&gt;</code><br>
<code>#include &lt;ogg_compat.h&gt;</code><br>
<p> <p>
<a href="oggz_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0> <a href="oggz_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
...@@ -515,7 +516,7 @@ Request a new serialno, as required for a new stream, ensuring the serialno is n ...@@ -515,7 +516,7 @@ Request a new serialno, as required for a new stream, ensuring the serialno is n
</td> </td>
</tr> </tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
00138 }; 00138 };
00139 00139
00140 <span class="preprocessor">#endif </span><span class="comment">/* __OGGZ_CONSTANTS_H__ */</span> 00140 <span class="preprocessor">#endif </span><span class="comment">/* __OGGZ_CONSTANTS_H__ */</span>
</pre></div><hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by </pre></div><hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -195,7 +195,7 @@ Flush after this packet. </td></tr> ...@@ -195,7 +195,7 @@ Flush after this packet. </td></tr>
</td> </td>
</tr> </tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
00101 <a class="code" href="oggz__table_8h.html#a6">oggz_table_nth</a> (OggzTable * table, <span class="keywordtype">int</span> n, <span class="keywordtype">long</span> * key); 00101 <a class="code" href="oggz__table_8h.html#a6">oggz_table_nth</a> (OggzTable * table, <span class="keywordtype">int</span> n, <span class="keywordtype">long</span> * key);
00102 00102
00103 <span class="preprocessor">#endif </span><span class="comment">/* __OGGZ_TABLE_H__ */</span> 00103 <span class="preprocessor">#endif </span><span class="comment">/* __OGGZ_TABLE_H__ */</span>
</pre></div><hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by </pre></div><hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -315,7 +315,7 @@ Query the number of elements in an OggzTable. ...@@ -315,7 +315,7 @@ Query the number of elements in an OggzTable.
</td> </td>
</tr> </tr>
</table> </table>
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 15 09:53:56 2003 for liboggz by <hr size="1"><address style="align: right;"><small>Generated on Wed Jan 21 15:05:41 2004 for liboggz by
<a href="http://www.doxygen.org/index.html"> <a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border=0 > <img src="doxygen.png" alt="doxygen" align="middle" border=0 >
</a>1.3.4 </small></address> </a>1.3.4 </small></address>
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
{\fancyplain{}{\bfseries\rightmark}} {\fancyplain{}{\bfseries\rightmark}}
\rhead[\fancyplain{}{\bfseries\leftmark}] \rhead[\fancyplain{}{\bfseries\leftmark}]
{\fancyplain{}{\bfseries\thepage}} {\fancyplain{}{\bfseries\thepage}}
\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Mon Dec 15 09:53:57 2003 for liboggz by Doxygen }]{} \rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Wed Jan 21 15:05:41 2004 for liboggz by Doxygen }]{}
\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Mon Dec 15 09:53:57 2003 for liboggz by Doxygen }} \lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Jan 21 15:05:41 2004 for liboggz by Doxygen }}
\cfoot{} \cfoot{}
\newenvironment{CompactList} \newenvironment{CompactList}
{\begin{list}{}{ {\begin{list}{}{
......
...@@ -22,6 +22,7 @@ To seek while reading Ogg files or streams you must instantiate an OGGZ handle f ...@@ -22,6 +22,7 @@ To seek while reading Ogg files or streams you must instantiate an OGGZ handle f
{\tt \#include $<$ogg/ogg.h$>$}\par {\tt \#include $<$ogg/ogg.h$>$}\par
{\tt \#include $<$oggz/oggz\_\-constants.h$>$}\par {\tt \#include $<$oggz/oggz\_\-constants.h$>$}\par
{\tt \#include $<$oggz/oggz\_\-table.h$>$}\par {\tt \#include $<$oggz/oggz\_\-table.h$>$}\par
{\tt \#include $<$ogg\_\-compat.h$>$}\par
\subsection*{Typedefs} \subsection*{Typedefs}
\begin{CompactItemize} \begin{CompactItemize}
\item \item
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
\vspace*{1cm} \vspace*{1cm}
{\large Generated by Doxygen 1.3.4}\\ {\large Generated by Doxygen 1.3.4}\\
\vspace*{0.5cm} \vspace*{0.5cm}
{\small Mon Dec 15 09:53:56 2003}\\ {\small Wed Jan 21 15:05:41 2004}\\
\end{center} \end{center}
\end{titlepage} \end{titlepage}
\clearemptydoublepage \clearemptydoublepage
......
...@@ -59,19 +59,12 @@ PRE_UNINSTALL = : ...@@ -59,19 +59,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
host_alias = @host_alias@ host_alias = @host_alias@
host_triplet = @host@ host_triplet = @host@
AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
ECHO = @ECHO@ ECHO = @ECHO@
EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
GETOPT_LIBS = @GETOPT_LIBS@ GETOPT_LIBS = @GETOPT_LIBS@
HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@
HAVE_DOCBOOKTOMAN = @HAVE_DOCBOOKTOMAN@ HAVE_DOCBOOKTOMAN = @HAVE_DOCBOOKTOMAN@
...@@ -88,7 +81,6 @@ OGG_CFLAGS = @OGG_CFLAGS@ ...@@ -88,7 +81,6 @@ OGG_CFLAGS = @OGG_CFLAGS@
OGG_LIBS = @OGG_LIBS@ OGG_LIBS = @OGG_LIBS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RC = @RC@
SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@
STRIP = @STRIP@ STRIP = @STRIP@
...@@ -108,9 +100,9 @@ GZIP_ENV = --best ...@@ -108,9 +100,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
...@@ -209,6 +201,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ...@@ -209,6 +201,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = include subdir = include
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
......
...@@ -60,19 +60,12 @@ PRE_UNINSTALL = : ...@@ -60,19 +60,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
host_alias = @host_alias@ host_alias = @host_alias@
host_triplet = @host@ host_triplet = @host@
AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@
CXXCPP = @CXXCPP@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
ECHO = @ECHO@ ECHO = @ECHO@
EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
GETOPT_LIBS = @GETOPT_LIBS@ GETOPT_LIBS = @GETOPT_LIBS@
HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@
HAVE_DOCBOOKTOMAN = @HAVE_DOCBOOKTOMAN@ HAVE_DOCBOOKTOMAN = @HAVE_DOCBOOKTOMAN@
...@@ -89,7 +82,6 @@ OGG_CFLAGS = @OGG_CFLAGS@ ...@@ -89,7 +82,6 @@ OGG_CFLAGS = @OGG_CFLAGS@
OGG_LIBS = @OGG_LIBS@ OGG_LIBS = @OGG_LIBS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RC = @RC@
SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@ SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@
STRIP = @STRIP@ STRIP = @STRIP@
...@@ -112,9 +104,9 @@ GZIP_ENV = --best ...@@ -112,9 +104,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/oggz/Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu include/oggz/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
...@@ -168,6 +160,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ...@@ -168,6 +160,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = include/oggz subdir = include/oggz
distdir: $(DISTFILES) distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/oggz/Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
......
...@@ -11,7 +11,7 @@ lib_LTLIBRARIES = liboggz.la ...@@ -11,7 +11,7 @@ lib_LTLIBRARIES = liboggz.la
liboggz_la_SOURCES = \ liboggz_la_SOURCES = \
oggz.c \ oggz.c \
oggz_private.h oggz_byteorder.h oggz_macros.h \ oggz_private.h oggz_byteorder.h oggz_compat.h oggz_macros.h \
oggz_read.c oggz_write.c \ oggz_read.c oggz_write.c \
oggz_auto.c oggz_auto.h \ oggz_auto.c oggz_auto.h \
oggz_table.c \ oggz_table.c \
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifndef WIN32 #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include "oggz_compat.h"
#include "oggz_private.h" #include "oggz_private.h"
#include "oggz_vector.h" #include "oggz_vector.h"
...@@ -332,13 +333,7 @@ oggz_serialno_new (OGGZ * oggz) ...@@ -332,13 +333,7 @@ oggz_serialno_new (OGGZ * oggz)
long serialno; long serialno;
do { do {
serialno = oggz_random();
#ifndef WIN32
serialno = random();
#else
serialno = rand();
#endif
} while (oggz_get_stream (oggz, serialno) != NULL); } while (oggz_get_stream (oggz, serialno) != NULL);
return serialno; return serialno;
......
...@@ -36,11 +36,7 @@ ...@@ -36,11 +36,7 @@
* Conrad Parker <conrad@annodex.net> * Conrad Parker <conrad@annodex.net>
*/ */
#ifndef WIN32
#include "config.h" #include "config.h"
#else
#include <config.h>
#endif
#if OGGZ_CONFIG_READ #if OGGZ_CONFIG_READ
...@@ -50,7 +46,7 @@ ...@@ -50,7 +46,7 @@
#include <sys/types.h> #include <sys/types.h>