From fe3f99c92a8437a353ba12075d6c3273d04c4e3f Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <wakeroid@gmail.com>
Date: Mon, 26 Jul 2010 10:04:43 +0200
Subject: merged non-android-specific changes from android branch

---
 plugins/adplug/adplug/dro.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/adplug/adplug/dro.cpp')

diff --git a/plugins/adplug/adplug/dro.cpp b/plugins/adplug/adplug/dro.cpp
index 8342fe89..1d7d5f8e 100644
--- a/plugins/adplug/adplug/dro.cpp
+++ b/plugins/adplug/adplug/dro.cpp
@@ -23,7 +23,7 @@
  * NOTES: 3-oct-04: the DRO format is not yet finalized. beware.
  */
 
-#include <cstring>
+#include <string.h>
 #include <stdio.h>
 
 #include "dro.h"
@@ -44,7 +44,7 @@ CdroPlayer::CdroPlayer(Copl *newopl)
     opl3_mode = 1;
 }
 
-bool CdroPlayer::load(const std::string &filename, const CFileProvider &fp)
+bool CdroPlayer::load(const char *filename, const CFileProvider &fp)
 {
   binistream *f = fp.open(filename); if(!f) return false;
   char id[8];
-- 
cgit v1.2.3