From 6f56124b28fe6603ad51093404d920ba690ea43a Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Sun, 26 Feb 2006 02:52:29 +0000
Subject: [PATCH] generic fuckups

Originally committed to SVN as r178.
---
 core/audio_player_portaudio.h | 2 +-
 core/mkv_wrap.cpp             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/audio_player_portaudio.h b/core/audio_player_portaudio.h
index 79b7e8f4f..813900b2e 100644
--- a/core/audio_player_portaudio.h
+++ b/core/audio_player_portaudio.h
@@ -63,7 +63,7 @@ private:
 	volatile __int64 startMS;
 	void *stream;
 
-	static int PortAudioPlayer::paCallback(void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, PaTimestamp outTime, void *userData);
+	static int paCallback(void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, PaTimestamp outTime, void *userData);
 
 public:
 	PortAudioPlayer();
diff --git a/core/mkv_wrap.cpp b/core/mkv_wrap.cpp
index 5e7da5e68..50b138248 100644
--- a/core/mkv_wrap.cpp
+++ b/core/mkv_wrap.cpp
@@ -37,6 +37,7 @@
 ///////////
 // Headers
 #include <algorithm>
+#include <errno.h>
 #include "mkv_wrap.h"
 #include "dialog_progress.h"