minor changes: libvorbis now builds with new system

svn path=/branches/branch_jackoggsvorbis/vorbis/; revision=669

2 files changed, 83 insertions, 23 deletions

diff --git a/include/vorbis/book/Makefile.am b/include/vorbis/book/Makefile.am
index 3208ab64..bd7c445f 100644
--- a/include/vorbis/book/Makefile.am
+++ b/include/vorbis/book/Makefile.am
@@ -4,27 +4,27 @@ AUTOMAKE_OPTIONS = foreign
 
 includedir = $(prefix)/include/vorbis/book
 
-include_HEADERS = lsp12_0.vqh res0_1024a_192_5.vqh res0_128a_192_4.vqh\
-	lsp30_0.vqh res0_1024a_256_1.vqh res0_128a_192_5.vqh\
-	res0_1024a_128_1.vqh res0_1024a_256_2.vqh res0_128a_256_1.vqh\
-	res0_1024a_128_2.vqh res0_1024a_256_3.vqh res0_128a_256_2.vqh\
-	res0_1024a_128_3.vqh res0_1024a_256_4.vqh res0_128a_256_3.vqh\
-	res0_1024a_128_4.vqh res0_1024a_256_5.vqh res0_128a_256_4.vqh\
-	res0_1024a_128_5.vqh res0_1024a_350_1.vqh res0_128a_256_5.vqh\
-	res0_1024a_128_6.vqh res0_1024a_350_2.vqh res0_128a_350_1.vqh\
-	res0_1024a_128_7.vqh res0_1024a_350_3.vqh res0_128a_350_2.vqh\
-	res0_1024a_128_8.vqh res0_1024a_350_4.vqh res0_128a_350_3.vqh\
-	res0_1024a_128_9.vqh res0_1024a_350_5.vqh res0_128a_350_4.vqh\
-	res0_1024a_160_1.vqh res0_128a_128_1.vqh res0_128a_350_5.vqh\
-	res0_1024a_160_2.vqh res0_128a_128_2.vqh resaux0_1024a_128.vqh\
-	res0_1024a_160_3.vqh res0_128a_128_3.vqh resaux0_1024a_160.vqh\
-	res0_1024a_160_4.vqh res0_128a_128_4.vqh resaux0_1024a_192.vqh\
-	res0_1024a_160_5.vqh res0_128a_128_5.vqh resaux0_1024a_256.vqh\
-	res0_1024a_160_6.vqh res0_128a_160_1.vqh resaux0_1024a_350.vqh\
-	res0_1024a_160_7.vqh res0_128a_160_2.vqh resaux0_128a_128.vqh\
-	res0_1024a_160_8.vqh res0_128a_160_3.vqh resaux0_128a_160.vqh\
-	res0_1024a_160_9.vqh res0_128a_160_4.vqh resaux0_128a_192.vqh\
-	res0_1024a_192_1.vqh res0_128a_160_5.vqh resaux0_128a_256.vqh\
-	res0_1024a_192_2.vqh res0_128a_192_1.vqh resaux0_128a_350.vqh\
-	res0_1024a_192_3.vqh res0_128a_192_2.vqh res0_1024a_192_4.vqh\ 
+include_HEADERS = lsp12_0.vqh res0_1024a_192_5.vqh res0_128a_192_4.vqh \
+	lsp30_0.vqh res0_1024a_256_1.vqh res0_128a_192_5.vqh \
+	res0_1024a_128_1.vqh res0_1024a_256_2.vqh res0_128a_256_1.vqh \
+	res0_1024a_128_2.vqh res0_1024a_256_3.vqh res0_128a_256_2.vqh \
+	res0_1024a_128_3.vqh res0_1024a_256_4.vqh res0_128a_256_3.vqh \
+	res0_1024a_128_4.vqh res0_1024a_256_5.vqh res0_128a_256_4.vqh \
+	res0_1024a_128_5.vqh res0_1024a_350_1.vqh res0_128a_256_5.vqh \
+	res0_1024a_128_6.vqh res0_1024a_350_2.vqh res0_128a_350_1.vqh \
+	res0_1024a_128_7.vqh res0_1024a_350_3.vqh res0_128a_350_2.vqh \
+	res0_1024a_128_8.vqh res0_1024a_350_4.vqh res0_128a_350_3.vqh \
+	res0_1024a_128_9.vqh res0_1024a_350_5.vqh res0_128a_350_4.vqh \
+	res0_1024a_160_1.vqh res0_128a_128_1.vqh res0_128a_350_5.vqh \
+	res0_1024a_160_2.vqh res0_128a_128_2.vqh resaux0_1024a_128.vqh \
+	res0_1024a_160_3.vqh res0_128a_128_3.vqh resaux0_1024a_160.vqh \
+	res0_1024a_160_4.vqh res0_128a_128_4.vqh resaux0_1024a_192.vqh \
+	res0_1024a_160_5.vqh res0_128a_128_5.vqh resaux0_1024a_256.vqh \
+	res0_1024a_160_6.vqh res0_128a_160_1.vqh resaux0_1024a_350.vqh \
+	res0_1024a_160_7.vqh res0_128a_160_2.vqh resaux0_128a_128.vqh \
+	res0_1024a_160_8.vqh res0_128a_160_3.vqh resaux0_128a_160.vqh \
+	res0_1024a_160_9.vqh res0_128a_160_4.vqh resaux0_128a_192.vqh \
+	res0_1024a_192_1.vqh res0_128a_160_5.vqh resaux0_128a_256.vqh \
+	res0_1024a_192_2.vqh res0_128a_192_1.vqh resaux0_128a_350.vqh \
+	res0_1024a_192_3.vqh res0_128a_192_2.vqh res0_1024a_192_4.vqh \
 	res0_128a_192_3.vqh
diff --git a/lib/os.h b/lib/os.h
new file mode 100644
index 00000000..8448e0c8
--- /dev/null
+++ b/lib/os.h
@@ -0,0 +1,60 @@
+#ifndef _OS_H
+#define _OS_H
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
+ *                                                                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
+ * http://www.xiph.org/                                             *
+ *                                                                  *
+ ********************************************************************
+
+ function: #ifdef jail to whip a few platforms into the UNIX ideal.
+ last mod: $Id: os.h,v 1.9.4.1 2000/09/07 07:42:57 jack Exp $
+
+ ********************************************************************/
+
+#include <math.h>
+#ifndef _V_IFDEFJAIL_H_
+#define _V_IFDEFJAIL_H_
+
+#ifndef M_PI
+#define M_PI (3.1415926539)
+#endif
+
+#ifndef __GNUC__
+#ifdef _WIN32
+#  include <malloc.h>
+#  define rint(x)   (floor((x)+0.5)) 
+#endif
+#endif
+
+#ifdef _WIN32
+#  define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
+#else /* if not _WIN32 */
+#  define FAST_HYPOT hypot
+#endif
+
+#endif
+
+#ifdef USE_ALLOCA_H
+#include <alloca.h>
+#endif
+
+#ifdef USE_MEMORY_H
+#include <memory.h>
+#endif
+
+#ifndef min
+#  define min(x,y)  ((x)>(y)?(y):(x))
+#endif
+
+#ifndef max
+#  define max(x,y)  ((x)<(y)?(y):(x))
+#endif
+
+#endif /* _OS_H */