Bug 651461 - Fix build failure in nsAudioStream.cpp due to conflicting types; r=roc
authorLandry Breuil <landry@openbsd.org>
Fri, 22 Apr 2011 10:38:42 +0200
changeset 68421 f0a03fc3247dc9a7246705e5303788c8cc87eece
parent 68420 157b8fe56dd627f2128d5adddd4673868b48f9f8
child 68429 49dd65bf80921d737d93b26efa10a5921aa4be7c
push id19632
push userMs2ger@gmail.com
push dateFri, 22 Apr 2011 09:27:39 +0000
treeherdermozilla-central@f0a03fc3247d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs651461
milestone6.0a1
first release with
nightly win64
f0a03fc3247d / 6.0a1 / 20110422030210 / files
nightly linux32
nightly linux64
nightly mac
nightly win32
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win64
Bug 651461 - Fix build failure in nsAudioStream.cpp due to conflicting types; r=roc
content/media/nsAudioStream.cpp
--- a/content/media/nsAudioStream.cpp
+++ b/content/media/nsAudioStream.cpp
@@ -561,17 +561,17 @@ PRInt64 nsAudioStreamLocal::GetSampleOff
   if (mInError) {
     return -1;
   }
  
   sa_position_t positionType = SA_POSITION_WRITE_SOFTWARE;
 #if defined(XP_WIN)
   positionType = SA_POSITION_WRITE_HARDWARE;
 #endif
-  PRInt64 position = 0;
+  int64_t position = 0;
   if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
                              positionType, &position) == SA_SUCCESS) {
     return position / sizeof(short);
   }
 
   return -1;
 }