Update of /cvsroot/audacity/audacity-src/win/Projects/libsndfile
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16910
Modified Files:
config.h sndfile.h
Log Message:
The max size/type for SF_COUNT_T were inconsistent causing odd behavior.
Index: sndfile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/Projects/libsndfile/sndfile.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sndfile.h 9 Feb 2009 06:29:23 -0000 1.1
+++ sndfile.h 14 Feb 2009 05:11:12 -0000 1.2
@@ -301,6 +301,12 @@
** header file to be compiler by both GCC and the microsoft compiler.
*/
+
+#ifdef _MSC_VER
+#include <limits.h>
+typedef __int64 sf_count_t ;
+#define SF_COUNT_MAX LLONG_MAX
+#else
#ifdef _MSCVER
typedef __int64_t sf_count_t ;
#define SF_COUNT_MAX 0x7fffffffffffffffi64
@@ -308,6 +314,7 @@
typedef off_t sf_count_t ;
#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL
#endif
+#endif
/* A pointer to a SF_INFO structure is passed to sf_open_read () and filled in.
Index: config.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/Projects/libsndfile/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.h 9 Feb 2009 06:29:23 -0000 1.1
+++ config.h 14 Feb 2009 05:11:12 -0000 1.2
@@ -293,7 +293,7 @@
#define PACKAGE_VERSION "1.0.18"
/* Set to maximum allowed value of sf_count_t type. */
-#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL
+#define SF_COUNT_MAX LLONG_MAX
/* The size of `double', as computed by sizeof. */
#define SIZEOF_DOUBLE 8
@@ -341,7 +341,7 @@
#define STDC_HEADERS 1
/* Set to long if unknown. */
-#define TYPEOF_SF_COUNT_T loff_t
+#define TYPEOF_SF_COUNT_T __int64
/* Set to 1 to use the native windows API */
#define USE_WINDOWS_API 1
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
