diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-09 07:05:30 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-09 07:05:30 +0000 |
| commit | baba52d3560eb85017ffa6837b47d1856c01488d (patch) | |
| tree | 3bfad824666c3873ae96160f9e8a9b2a63bf7ed3 | |
| parent | 8626235c0fb25ae48d09f16f99319b95380edfe8 (diff) | |
| download | pcsxr-baba52d3560eb85017ffa6837b47d1856c01488d.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gui/AboutDlg.c | 2 | ||||
| -rw-r--r-- | plugins/dfinput/cfg-gtk2.c | 4 | ||||
| -rw-r--r-- | plugins/dfinput/cfg.c | 4 | ||||
| -rw-r--r-- | plugins/dfinput/pad.c | 2 | ||||
| -rw-r--r-- | plugins/dfinput/pad.h | 4 |
6 files changed, 14 insertions, 8 deletions
@@ -12,6 +12,12 @@ July 9, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> * configure.ac: Fixed FTBFS on Solaris.
* plugins/peopsxgl/draw.c: Don't use glColorTableEXT on Solaris.
* libpcsxcore/socket.c: Silenced warning on Solaris.
+ * plugins/dfinput/cfg.c: Renamed LoadConfig()/SaveConfig() to avoid problems
+ with some OSes like Solaris.
+ * plugins/dfinput/cfg-gtk2.c: Likewise.
+ * plugins/dfinput/pad.c: Likewise.
+ * plugins/dfinput/pad.h: Likewise.
+ * gui/AboutDlg.c: Minor text change.
July 8, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index ca001b1f..b94a6d74 100644 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -40,7 +40,7 @@ void RunAboutDialog(void) { "Peter Collingbourne", "shalma", "Tristin Celestin", - "...see the included AUTHORS file for more detail.", + "(See the included AUTHORS file for more details.)", "", "PCSX-df Team:", "Ryan Schultz <schultz.ryan@gmail.com>", 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(); |