Fixing win32/linux build snafu

svn path=/trunk/vorbis/; revision=353

diff --git a/include/vorbis/codec.h b/include/vorbis/codec.h
index b13fdc3..709e5e6 100644 (file)
--- a/include/vorbis/codec.h
+++ b/include/vorbis/codec.h
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: libvorbis codec headers
- last mod: $Id: codec.h,v 1.13 2000/05/01 05:39:47 jon Exp $
+ last mod: $Id: codec.h,v 1.14 2000/05/01 06:27:05 jon Exp $
 
  ********************************************************************/
 
@@ -28,7 +28,7 @@ extern "C"
 #define MAX_BARK 27
 
 #include <sys/types.h>
-#include "os.h"
+#include "os_types.h"
 #include "vorbis/codebook.h"
 #include "vorbis/internal.h"
 

diff --git a/lib/os.h b/lib/os.h
index a7e0041..7c0c65d 100644 (file)
--- a/lib/os.h
+++ b/lib/os.h
@@ -14,7 +14,7 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.3 2000/05/01 05:46:47 jon Exp $
+ last mod: $Id: os.h,v 1.4 2000/05/01 06:26:52 jon Exp $
 
  ********************************************************************/
 
@@ -37,8 +37,6 @@
 #endif
 
 #ifdef _WIN32
-typedef __int64 int64_t;
-typedef unsigned int u_int32_t;
 #  define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
 #else // if not _WIN32
 #  define FAST_HYPOT hypot
@@ -46,5 +44,7 @@ typedef unsigned int u_int32_t;
 
 #endif
 
+#include "../include/vorbis/os_types.h"
+
 #endif // _OS_H