xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
SND\weimingzhi_cp 2010-07-09 07:05:30 +00:00
parent 8626235c0f
commit baba52d356
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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>

2
gui/AboutDlg.c
View File

@ -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>",

4
plugins/dfinput/cfg-gtk2.c
View File

@ -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) {

4
plugins/dfinput/cfg.c
View File

@ -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;

2
plugins/dfinput/pad.c
View File

@ -31,7 +31,7 @@ uint32_t PSEgetLibVersion(void) {
}
long PADinit(long flags) {
LoadConfig();
LoadPADConfig();
g.PadState[0].PadMode = 0;
g.PadState[0].PadID = 0x41;

4
plugins/dfinput/pad.h
View File

@ -139,8 +139,8 @@ enum {
};
// cfg.c functions...
void LoadConfig();
void SaveConfig();
void LoadPADConfig();
void SavePADConfig();
// sdljoy.c functions...
void InitSDLJoy();