From 7698fe288404eefa383d1e13a1fb587886a4bed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 20 Sep 2004 19:31:53 +0000 Subject: Save diff to original win32-pthreads. CVS patchset: 6983 CVS date: 2004/09/20 19:31:53 --- win32/contrib/pthreads/diff_to_original.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 win32/contrib/pthreads/diff_to_original.patch diff --git a/win32/contrib/pthreads/diff_to_original.patch b/win32/contrib/pthreads/diff_to_original.patch new file mode 100644 index 000000000..5655d4fc7 --- /dev/null +++ b/win32/contrib/pthreads/diff_to_original.patch @@ -0,0 +1,21 @@ +Removed the wrapper for strtok_r from public header. + +Index: pthread.h +=================================================================== +RCS file: /home/valtri/CVS/xine-lib/win32/contrib/pthreads/pthread.h,v +retrieving revision 1.1.1.1 +diff -u -p -r1.1.1.1 pthread.h +--- pthread.h 26 Jul 2004 15:27:53 -0000 1.1.1.1 ++++ pthread.h 16 Sep 2004 21:07:10 -0000 +@@ -978,11 +978,6 @@ int * _errno( void ); + * actually exist on WIN32. + */ + +-#if !defined(__MINGW32__) +-#define strtok_r( _s, _sep, _lasts ) \ +- ( *(_lasts) = strtok( (_s), (_sep) ) ) +-#endif /* !__MINGW32__ */ +- + #define asctime_r( _tm, _buf ) \ + ( strcpy( (_buf), asctime( (_tm) ) ), \ + (_buf) ) -- cgit v1.2.3