Symbian: fix compilation and small include improvement

diff --git a/src/symbian/dirs.c b/src/symbian/dirs.c
index 74ec1d2c398ab8622c27f6d966d03b52d10022e5..816e197cefba1f6bc4ec51d1c02a03abc456e935 100755 (executable)
--- 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 40261a965e19ca195dba7e62a66f151483d0562f..0a54d1a075bb5e960222a087582b6450e81c03a6 100755 (executable)
--- 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 a71de2711f9c7f3ba6bbf9514f40495e38be4e43..3b2b2806feb75c0afdb03f818a56fd221a195e95 100755 (executable)
--- 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);