From baba52d3560eb85017ffa6837b47d1856c01488d Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Fri, 9 Jul 2010 07:05:30 +0000
Subject: dfinput: renamed LoadConfig()/SaveConfig() to avoid problems with
 Solaris.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54400 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/dfinput/cfg-gtk2.c | 4 ++--
 plugins/dfinput/cfg.c      | 4 ++--
 plugins/dfinput/pad.c      | 2 +-
 plugins/dfinput/pad.h      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/dfinput')

diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index 768e317e..4bc5a7a3 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -255,7 +255,7 @@ static void UpdateKey() {
 }
 
 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
-	SaveConfig();
+	SavePADConfig();
 
 	gtk_widget_destroy(widget);
 	SDL_Quit();
@@ -569,7 +569,7 @@ long PADconfigure() {
 		return -1;
 	}
 
-	LoadConfig();
+	LoadPADConfig();
 
 	xml = glade_xml_new(DATADIR "dfinput.glade2", "CfgWnd", NULL);
 	if (xml == NULL) {
diff --git a/plugins/dfinput/cfg.c b/plugins/dfinput/cfg.c
index 1da137ad..ce9a97f2 100644
--- a/plugins/dfinput/cfg.c
+++ b/plugins/dfinput/cfg.c
@@ -110,7 +110,7 @@ static void SetDefaultConfig() {
 	g.cfg.PadDef[1].KeyDef[DKEY_SQUARE].J.Button = 3;
 }
 
-void LoadConfig() {
+void LoadPADConfig() {
 	FILE		*fp;
 	char		buf[256];
 	int			current, a, b, c;
@@ -264,7 +264,7 @@ void LoadConfig() {
 	fclose(fp);
 }
 
-void SaveConfig() {
+void SavePADConfig() {
 	FILE		*fp;
 	int			i;
 
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index 1fdda103..e08db98d 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -31,7 +31,7 @@ uint32_t PSEgetLibVersion(void) {
 }
 
 long PADinit(long flags) {
-	LoadConfig();
+	LoadPADConfig();
 
 	g.PadState[0].PadMode = 0;
 	g.PadState[0].PadID = 0x41;
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index 7989e69d..bee7a2cf 100644
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
@@ -139,8 +139,8 @@ enum {
 };
 
 // cfg.c functions...
-void LoadConfig();
-void SaveConfig();
+void LoadPADConfig();
+void SavePADConfig();
 
 // sdljoy.c functions...
 void InitSDLJoy();
-- 
cgit v1.2.3