summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--pthread.h4
-rw-r--r--pthread_cancel.c4
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b69c039..393cfe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25 Prashant Thakre <prashant.thakre at gmail.com>
+
+ * pthread_cancel.c: Added _M_IA64 register context support.
+
2005-05-13 Ross Johnson <ross at callisto.canberra.edu.au>
* pthread_kill.c (pthread_kill): Remove check for Win32 thread
diff --git a/pthread.h b/pthread.h
index eddbb53..f3d2dac 100644
--- a/pthread.h
+++ b/pthread.h
@@ -37,8 +37,8 @@
* See the README file for an explanation of the pthreads-win32 version
* numbering scheme and how the DLL is named etc.
*/
-#define PTW32_VERSION 2,7,0,0
-#define PTW32_VERSION_STRING "2, 7, 0, 0\0"
+#define PTW32_VERSION 2,8,0,0
+#define PTW32_VERSION_STRING "2, 8, 0, 0\0"
/* There are three implementations of cancel cleanup.
* Note that pthread.h is included in both application
diff --git a/pthread_cancel.c b/pthread_cancel.c
index 971edc8..1118977 100644
--- a/pthread_cancel.c
+++ b/pthread_cancel.c
@@ -41,6 +41,10 @@
#define PTW32_PROGCTR(Context) ((Context).Eip)
#endif
+#if defined (_M_IA64)
+#define PTW32_PROGCTR(Context) ((Context).StIIP)
+#endif
+
#if defined(_MIPS_)
#define PTW32_PROGCTR(Context) ((Context).Fir)
#endif