From 199ffc13657a836c1469ea29942ee7c0a63c79a6 Mon Sep 17 00:00:00 2001 From: pixel Date: Wed, 2 Nov 2005 21:34:01 +0000 Subject: Adding DVD support, and updating zlib. --- include/generic.h | 12 ++++++++++-- lib/Input.cc | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/generic.h b/include/generic.h index ee41652..ab0f74a 100644 --- a/include/generic.h +++ b/include/generic.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: generic.h,v 1.33 2005-02-17 08:33:49 pixel Exp $ */ +/* $Id: generic.h,v 1.34 2005-11-02 21:34:01 pixel Exp $ */ #ifndef __GENERIC_H__ #define __GENERIC_H__ @@ -134,12 +134,20 @@ typedef unsigned _int64 Uint64; extern char verbosity; char ** split(char * s, char t); -#ifdef _WIN32 +#if defined(_WIN32) #define tolittle(x) x static Uint32 tobig(Uint32 x) { return (x >> 24) | ((x >> 8) & 0x0000ff00) | ((x << 8) & 0x00ff0000) | (x << 24); } +#elif defined(WORDS_BIGENDIAN) +#define tobig(x) x +static Uint32 tolittle(Uint32 x) { + return (x >> 24) | ((x >> 8) & 0x0000ff00) | ((x << 8) & 0x00ff0000) | (x << 24); +} #else +#ifndef WORDS_LITTLEENDIAN +#warning Using little endian by default. +#endif #define tolittle(x) x static Uint32 tobig(Uint32 x) { return (x >> 24) | ((x >> 8) & 0x0000ff00) | ((x << 8) & 0x00ff0000) | (x << 24); diff --git a/lib/Input.cc b/lib/Input.cc index 1c58dab..731cedc 100644 --- a/lib/Input.cc +++ b/lib/Input.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Input.cc,v 1.51 2005-02-17 08:33:50 pixel Exp $ */ +/* $Id: Input.cc,v 1.52 2005-11-02 21:34:01 pixel Exp $ */ #include #include @@ -215,6 +215,9 @@ int Input::wrapopen(const String & fname, openresults_t * results) { return open(fname.to_charp(), O_RDONLY #ifdef _WIN32 | O_BINARY +#endif +#ifdef O_LARGEFILE + | O_LARGEFILE #endif ); #else -- cgit v1.2.3