diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-20 19:31:53 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-20 19:31:53 +0000 |
| commit | 7698fe288404eefa383d1e13a1fb587886a4bed4 (patch) | |
| tree | 4b01209ec02eb2ac050c6f948dd8ec220d16d306 | |
| parent | 7204b84beb0f5cfb166e8d56402371d05bece83b (diff) | |
| download | xine-lib-7698fe288404eefa383d1e13a1fb587886a4bed4.tar.gz xine-lib-7698fe288404eefa383d1e13a1fb587886a4bed4.tar.bz2 | |
Save diff to original win32-pthreads.
CVS patchset: 6983
CVS date: 2004/09/20 19:31:53
| -rw-r--r-- | win32/contrib/pthreads/diff_to_original.patch | 21 |
1 files changed, 21 insertions, 0 deletions
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) )
|