From 7303be019554c171560aecc7ea47901684f0b298 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 1 Jun 2014 04:50:00 +0200
Subject: [PATCH] Merge rarch_console.h with frontend.h

---
 console/rarch_console.h     | 45 -------------------------------------
 frontend/frontend.h         | 25 +++++++++++++++++++++
 frontend/frontend_context.h |  2 +-
 settings.c                  |  2 +-
 4 files changed, 27 insertions(+), 47 deletions(-)
 delete mode 100644 console/rarch_console.h

diff --git a/console/rarch_console.h b/console/rarch_console.h
deleted file mode 100644
index 2f3e8ec307..0000000000
--- a/console/rarch_console.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2014 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CONSOLE_EXT_H__
-#define CONSOLE_EXT_H__
-
-#include <stdint.h>
-#include <stddef.h>
-
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-typedef struct
-{
-   char config_path[PATH_MAX];
-   char autoconfig_dir[PATH_MAX];
-   char assets_dir[PATH_MAX];
-   char core_dir[PATH_MAX];
-   char core_info_dir[PATH_MAX];
-   char overlay_dir[PATH_MAX];
-   char port_dir[PATH_MAX];
-   char shader_dir[PATH_MAX];
-   char savestate_dir[PATH_MAX];
-   char sram_dir[PATH_MAX];
-   char screenshot_dir[PATH_MAX];
-   char system_dir[PATH_MAX];
-} default_paths_t;
-
-default_paths_t default_paths;
-
-#endif
diff --git a/frontend/frontend.h b/frontend/frontend.h
index 3a5ac8903e..a80d31d7ef 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -18,6 +18,13 @@
 #ifndef _RARCH_FRONTEND_H
 #define _RARCH_FRONTEND_H
 
+#include <stdint.h>
+#include <stddef.h>
+
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 #if defined(ANDROID)
 #define args_type() struct android_app*
 #define signature() void* data
@@ -26,6 +33,24 @@
 #define signature() int argc, char *argv[]
 #endif
 
+typedef struct
+{
+   char config_path[PATH_MAX];
+   char autoconfig_dir[PATH_MAX];
+   char assets_dir[PATH_MAX];
+   char core_dir[PATH_MAX];
+   char core_info_dir[PATH_MAX];
+   char overlay_dir[PATH_MAX];
+   char port_dir[PATH_MAX];
+   char shader_dir[PATH_MAX];
+   char savestate_dir[PATH_MAX];
+   char sram_dir[PATH_MAX];
+   char screenshot_dir[PATH_MAX];
+   char system_dir[PATH_MAX];
+} default_paths_t;
+
+default_paths_t default_paths;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h
index 1952ef2e11..2f6a713e21 100644
--- a/frontend/frontend_context.h
+++ b/frontend/frontend_context.h
@@ -23,7 +23,7 @@
 #include "../config.h"
 #endif
 
-#include "../console/rarch_console.h"
+#include "frontend.h"
 
 typedef struct frontend_ctx_driver
 {
diff --git a/settings.c b/settings.c
index 782b4ee6cc..f48e2b1934 100644
--- a/settings.c
+++ b/settings.c
@@ -21,7 +21,7 @@
 #include "file.h"
 #include "compat/posix_string.h"
 #include "input/input_common.h"
-#include "console/rarch_console.h"
+#include "frontend/frontend.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"