summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-10-31 09:40:55 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-10-31 09:40:55 +0000
commite719dae71d52983edb311fa29fb88a01220547ec (patch)
tree3d7d0e53758dadf1d7dc65024974c8713b630037
parentca856e539419b30201a64b7608debd0fb191a2a3 (diff)
downloadpcsxr-e719dae71d52983edb311fa29fb88a01220547ec.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@34278 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog5
-rw-r--r--libpcsxcore/cdriso.c2
-rw-r--r--plugins/dfinput/pad.c4
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bad03c69..b16ff0e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+October 31, 2009 Wei Mingzhi <weimingzhi@gmail.com>
+
+ * libpcsxcore/cdriso.c: Declare thread controlling variable as volatile.
+ * plugins/dfinput/pad.c: Likewise.
+
October 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* data/pcsx.glade2: Do not allow resizing for dialog boxes.
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 9c34f229..fee82551 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -57,7 +57,7 @@ static HANDLE threadid;
static pthread_t threadid;
#endif
static int initial_offset = 0;
-static char playing = 0;
+static volatile char playing = 0;
static char cddaBigEndian = 0;
char* CALLBACK CDR__getDriveLetter(void);
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index 77b72994..e6ced19a 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -50,8 +50,8 @@ long PADshutdown(void) {
return PSE_PAD_ERR_SUCCESS;
}
-static pthread_t ThreadID;
-static uint8_t TerminateThread = 0;
+static pthread_t ThreadID;
+static volatile uint8_t TerminateThread = 0;
static void *JoyThread(void *param) {
while (!TerminateThread) {