Header include changes

audio/audio_driver.c

@@ -26,7 +26,8 @@
 
 #include "../command_event.h"
 #include "../configuration.h"
-#include "../general.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../performance.h"
 #include "../verbosity.h"
 #include "../list_special.h"

camera/camera_driver.c

@@ -18,7 +18,9 @@
 
 #include "camera_driver.h"
 
-#include "../general.h"
+#include "../configuration.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../list_special.h"
 #include "../verbosity.h"
 

general.h

@@ -33,21 +33,4 @@
 #define PACKAGE_VERSION "1.3.3"
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * retro_fail:
- * @error_code  : Error code.
- * @error       : Error message to show.
- *
- * Sanely kills the program.
- **/
-void retro_fail(int error_code, const char *error);
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif

gfx/video_driver.c

@@ -27,7 +27,8 @@
 #include "video_context_driver.h"
 #include "../record/record_driver.h"
 #include "../config.def.h"
-#include "../general.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../performance.h"
 #include "../list_special.h"
 #include "../libretro_version_1.h"

input/input_driver.c

@@ -16,9 +16,12 @@
 
 #include <string.h>
 
+#include "input_driver.h"
+
 #include "input_remapping.h"
 
-#include "../general.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../movie.h"
 #include "../list_special.h"
 #include "../verbosity.h"

location/location_driver.c

@@ -18,7 +18,9 @@
 
 #include "location_driver.h"
 
-#include "../general.h"
+#include "../configuration.h"
+#include "../retroarch.h"
+#include "../runloop.h"
 #include "../system.h"
 #include "../list_special.h"
 #include "../verbosity.h"

menu/menu_driver.c

@@ -29,7 +29,7 @@
 
 #include "../content.h"
 #include "../core_info.h"
-#include "../general.h"
+#include "../retroarch.h"
 #include "../system.h"
 #include "../defaults.h"
 #include "../frontend/frontend.h"

movie.c

@@ -21,10 +21,12 @@
 #include <rhash.h>
 #include <retro_endianness.h>
 
+#include "configuration.h"
 #include "movie.h"
 #include "libretro_version_1.h"
 #include "content.h"
-#include "general.h"
+#include "retroarch.h"
+#include "runloop.h"
 #include "msg_hash.h"
 #include "verbosity.h"
 

movie.h

@@ -37,7 +37,7 @@ typedef struct bsv_movie bsv_movie_t;
 
 enum rarch_movie_type
 {
-   RARCH_MOVIE_PLAYBACK,
+   RARCH_MOVIE_PLAYBACK = 0,
    RARCH_MOVIE_RECORD
 };
 

retroarch.h

@@ -173,6 +173,15 @@ const char *rarch_get_current_savefile_dir(void);
 
 bool rarch_game_options_validate(char *s, size_t len, bool mkdir);
 
+/**
+ * retro_fail:
+ * @error_code  : Error code.
+ * @error       : Error message to show.
+ *
+ * Sanely kills the program.
+ **/
+void retro_fail(int error_code, const char *error);
+
 #ifdef __cplusplus
 }
 #endif