Rename file.c/file.h to content.c/content.h

Makefile.common

@@ -91,7 +91,7 @@ OBJ += frontend/frontend.o \
 		libretro_version_1.o \
 		retroarch.o \
 		runloop.o \
-		file.o \
+		content.o \
 		libretro-sdk/file/file_list.o \
 		dir_list.o \
 		libretro-sdk/string/string_list.o \

conf/config_file.c

@@ -22,7 +22,6 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <compat/msvc.h>
-#include "../file.h"
 #include "../file_path.h"
 #include "../general.h"
 

content.c

@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "file.h"
+#include "content.h"
 #include "file_path.h"
 #include "rarch_file_path.h"
 #include "general.h"

core_info.h

@@ -19,7 +19,6 @@
 #define CORE_INFO_H_
 
 #include "conf/config_file.h"
-#include "file.h"
 #include <stddef.h>
 
 #ifdef __cplusplus

core_options.c

@@ -16,7 +16,6 @@
 #include "core_options.h"
 #include <string.h>
 #include "conf/config_file.h"
-#include "file.h"
 #include "dir_list.h"
 #include <compat/posix_string.h>
 #include <compat/strl.h>

driver.c

@@ -17,7 +17,6 @@
 
 #include "driver.h"
 #include "general.h"
-#include "file.h"
 #include "libretro.h"
 #include <stdint.h>
 #include <string.h>

gfx/fonts/freetype.c

@@ -14,7 +14,6 @@
  */
 
 #include "fonts.h"
-#include "../../file.h"
 #include "../../file_path.h"
 #include "../../general.h"
 #include <string.h>

gfx/gl.c

@@ -23,7 +23,6 @@
 #include "../performance.h"
 #include "scaler/scaler.h"
 #include "image/image.h"
-#include "../file.h"
 
 #include <stdint.h>
 #include "../libretro.h"

gfx/image/image_rpng.c

@@ -18,7 +18,6 @@
 #endif
 
 #include "image.h"
-#include "../../file.h"
 #include "../../rarch_file_path.h"
 
 #include <stdlib.h>

gfx/py_state/py_state.c

@@ -25,7 +25,6 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include "../../input/input_common.h"
-#include "../../file.h"
 #include "../../rarch_file_path.h"
 
 static PyObject* py_read_wram(PyObject *self, PyObject *args)

gfx/shader/shader_gl_cg.c

@@ -35,7 +35,6 @@
 #include <compat/posix_string.h>
 #include "../../conf/config_file.h"
 #include "../../dynamic.h"
-#include "../../file.h"
 #include "../../file_path.h"
 
 #include "../state_tracker.h"

gfx/shader/shader_glsl.c

@@ -20,7 +20,6 @@
 #include <compat/posix_string.h>
 #include "../state_tracker.h"
 #include "../../dynamic.h"
-#include "../../file.h"
 #include "../../rarch_file_path.h"
 
 #ifdef HAVE_CONFIG_H

gfx/shader/shader_null.c

@@ -21,7 +21,6 @@
 #include <compat/posix_string.h>
 #include "../state_tracker.h"
 #include "../../dynamic.h"
-#include "../../file.h"
 #include "../math/matrix.h"
 
 #ifdef HAVE_CONFIG_H

gfx/shader/shader_parse.c

@@ -19,7 +19,6 @@
 #include <compat/posix_string.h>
 #include <compat/msvc.h>
 #include <compat/strl.h>
-#include "../../file.h"
 #include "../../file_path.h"
 #include "../../general.h"
 

griffin/griffin.c

@@ -519,7 +519,7 @@ DYNAMIC
 /*============================================================
 FILE
 ============================================================ */
-#include "../file.c"
+#include "../content.c"
 #include "../file_path.c"
 #include "../dir_list.c"
 #include "../libretro-sdk/string/string_list.c"

input/input_common.c

@@ -48,7 +48,6 @@
 #include <linux/kd.h>
 #endif
 
-#include "../file.h"
 
 rarch_joypad_driver_t *joypad_drivers[] = {
 #ifdef __CELLOS_LV2__

input/overlay.c

@@ -21,7 +21,6 @@
 #include "../conf/config_file.h"
 #include <compat/posix_string.h>
 #include "input_common.h"
-#include "../file.h"
 #include "../file_path.h"
 #include <stddef.h>
 #include <math.h>

retroarch.c

@@ -22,6 +22,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include "content.h"
 #include "rarch_file_path.h"
 #include "dir_list.h"
 #include "general.h"

screenshot.c

@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <string.h>
 #include "general.h"
-#include "file.h"
 #include "file_path.h"
 #include "gfx/scaler/scaler.h"