From 39e6f9733a2680d97db891bec163bb91e96c20d9 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Mon, 24 Jun 2013 18:43:56 +0300
Subject: [PATCH] rename config.c/h

---
 Makefile                                    | 2 +-
 platform/common/{config.c => config_file.c} | 2 +-
 platform/common/{config.h => config_file.h} | 0
 platform/common/emu.c                       | 2 +-
 platform/common/main.c                      | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename platform/common/{config.c => config_file.c} (99%)
 rename platform/common/{config.h => config_file.h} (100%)

diff --git a/Makefile b/Makefile
index 32d4b59..f0fdc5a 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ OBJS += platform/linux/emu.o platform/linux/blit.o \
 
 # common
 OBJS += platform/common/main.o platform/common/emu.o platform/common/menu_pico.o \
-	platform/common/config.o platform/common/plat_sdl.o \
+	platform/common/config_file.o platform/common/plat_sdl.o \
 	platform/common/mp3_dummy.o
 
 # libpicofe
diff --git a/platform/common/config.c b/platform/common/config_file.c
similarity index 99%
rename from platform/common/config.c
rename to platform/common/config_file.c
index 3ef1387..956ba4a 100644
--- a/platform/common/config.c
+++ b/platform/common/config_file.c
@@ -16,7 +16,7 @@
 #include "../libpicofe/input.h"
 #include "../libpicofe/plat.h"
 #include "../libpicofe/lprintf.h"
-#include "config.h"
+#include "config_file.h"
 
 static char *mystrip(char *str);
 
diff --git a/platform/common/config.h b/platform/common/config_file.h
similarity index 100%
rename from platform/common/config.h
rename to platform/common/config_file.h
diff --git a/platform/common/emu.c b/platform/common/emu.c
index e0c50af..36539c6 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -22,7 +22,7 @@
 #include "emu.h"
 #include "input_pico.h"
 #include "menu_pico.h"
-#include "config.h"
+#include "config_file.h"
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
diff --git a/platform/common/main.c b/platform/common/main.c
index 968da0d..b9c4bd2 100644
--- a/platform/common/main.c
+++ b/platform/common/main.c
@@ -15,7 +15,7 @@
 #include "../libpicofe/plat.h"
 #include "menu_pico.h"
 #include "emu.h"
-#include "config.h"
+//#include "config.h"
 #include <cpu/debug.h>
 #include <version.h>
 
-- 
2.39.2