Merge branch 'master' of github.com:LaurentGomila/SFML

This commit is contained in:
Laurent Gomila 2011-07-05 23:05:15 +02:00
commit e120bd82fe
2 changed files with 6 additions and 5 deletions

View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 1999-2010 Erik de Castro Lopo <erikd@mega-nerd.com> ** Copyright (C) 1999-2011Erik de Castro Lopo <erikd@mega-nerd.com>
** **
** This program is free software; you can redistribute it and/or modify ** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU Lesser General Public License as published by ** it under the terms of the GNU Lesser General Public License as published by
@ -305,16 +305,17 @@ enum
typedef struct SNDFILE_tag SNDFILE ; typedef struct SNDFILE_tag SNDFILE ;
/* The following typedef is system specific and is defined when libsndfile is /* The following typedef is system specific and is defined when libsndfile is
** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t ** compiled. sf_count_t will be a 64 bit value when the underlying OS allows
** (Solaris), __int64 (Win32) etc. On windows, we need to allow the same ** 64 bit file offsets.
** header file to be compiler by both GCC and the microsoft compiler. ** On windows, we need to allow the same header file to be compiler by both GCC
** and the Microsoft compiler.
*/ */
#if (defined (_MSCVER) || defined (_MSC_VER)) #if (defined (_MSCVER) || defined (_MSC_VER))
typedef __int64 sf_count_t ; typedef __int64 sf_count_t ;
#define SF_COUNT_MAX 0x7fffffffffffffffi64 #define SF_COUNT_MAX 0x7fffffffffffffffi64
#else #else
typedef off_t sf_count_t ; typedef int64_t sf_count_t ;
#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL
#endif #endif