[xiph-commits] r8532 - in trunk/oggdsf/src: lib/core/ogg/libOOOgg tools/AnxCutter

[ozone at motherfish-iii.xiph.org]

Author: ozone
Date: 2004-12-25 05:42:40 -0800 (Sat, 25 Dec 2004)
New Revision: 8532

Modified:
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
   trunk/oggdsf/src/tools/AnxCutter/stdafx.h
Log:
oggdsf:

 * Portability fixes



Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-25 06:31:28 UTC (rev 8531)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2004-12-25 13:42:40 UTC (rev 8532)
@@ -207,7 +207,7 @@
 
 }
 
-__int64 OggPageInterleaver::progressTime() {
+LOOG_INT64 OggPageInterleaver::progressTime() {
 	return mProgressTime;
 }
 bool OggPageInterleaver::isProcessable() {
@@ -249,4 +249,4 @@
 		retVal = retVal && (mInputStreams[i]->isEmpty());
 	}
 	return retVal;
-}
\ No newline at end of file
+}

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h	2004-12-25 06:31:28 UTC (rev 8531)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.h	2004-12-25 13:42:40 UTC (rev 8532)
@@ -54,7 +54,7 @@
 	virtual bool isAllEOS();
 	virtual bool isAllEmpty();
 
-	virtual __int64 progressTime();
+	virtual LOOG_INT64 progressTime();
 
 	//INotifyArrival Implementation
 	virtual void notifyArrival();
@@ -64,7 +64,7 @@
 	IOggCallback* mFileWriter;		//TODO::: Shuoldn't be called filewriter.
 	INotifyComplete* mNotifier;
 
-	__int64 mProgressTime;
+	LOOG_INT64 mProgressTime;
 	//DEBUG ONLY
 	fstream debugLog;
 	//

Modified: trunk/oggdsf/src/tools/AnxCutter/stdafx.h
===================================================================
--- trunk/oggdsf/src/tools/AnxCutter/stdafx.h	2004-12-25 06:31:28 UTC (rev 8531)
+++ trunk/oggdsf/src/tools/AnxCutter/stdafx.h	2004-12-25 13:42:40 UTC (rev 8532)
@@ -7,6 +7,9 @@
 
 
 #include <iostream>
-#include <tchar.h>
 
+#ifdef WIN32
+# include <tchar.h>
+#endif
+
 // TODO: reference additional headers your program requires here