Commit ad01fcb0 authored by jon's avatar jon

Fixing win32/linux build snafu

svn path=/trunk/vorbis/; revision=353
parent 5aa00ab1
......@@ -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"
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment