[vlc-commits] commit: Symbian: fix compilation and small include improvement ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jan 11 00:10:18 2011 +0100| [8cee1ead2999e9ba4fe4a8e8eb2d159b9a1ade16] | committer: Jean-Baptiste Kempf 

Symbian: fix compilation and small include improvement

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8cee1ead2999e9ba4fe4a8e8eb2d159b9a1ade16
---

 src/symbian/dirs.c   |    4 +++-
 src/symbian/path.cpp |    4 +++-
 src/symbian/path.h   |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/symbian/dirs.c b/src/symbian/dirs.c
index 74ec1d2..816e197 100755
--- a/src/symbian/dirs.c
+++ b/src/symbian/dirs.c
@@ -25,10 +25,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 #include <vlc_common.h>
 
-#include "../../../../src/libvlc.h"
+#include "../libvlc.h"
 #include <vlc_charset.h>
+#include <vlc_configuration.h>
 #include "config/configuration.h"
 
 #include <string.h>
diff --git a/src/symbian/path.cpp b/src/symbian/path.cpp
index 40261a9..0a54d1a 100755
--- a/src/symbian/path.cpp
+++ b/src/symbian/path.cpp
@@ -22,7 +22,9 @@
 #include <string.h>     /* strlen */
 #include <utf.h>        /* CnvUtfConverter */
 
-#include "path.h"
+extern "C" {
+    #include "path.h"
+}
 
 /*Way to Find AppPrivatePath (A Path where an application can store its private data) */
 static TInt GetPrivatePath(TFileName& privatePath)
diff --git a/src/symbian/path.h b/src/symbian/path.h
index a71de27..3b2b280 100755
--- a/src/symbian/path.h
+++ b/src/symbian/path.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-extern "C" char * GetConstPrivatePath(void);
+char * GetConstPrivatePath(void);