summaryrefslogtreecommitdiff
path: root/win32/contrib/pthreads
diff options
context:
space:
mode:
Diffstat (limited to 'win32/contrib/pthreads')
-rw-r--r--win32/contrib/pthreads/Makefile.am2
-rw-r--r--win32/contrib/pthreads/pthread.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/win32/contrib/pthreads/Makefile.am b/win32/contrib/pthreads/Makefile.am
index 8535ffc9a..31a792050 100644
--- a/win32/contrib/pthreads/Makefile.am
+++ b/win32/contrib/pthreads/Makefile.am
@@ -2,7 +2,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
AM_CPPFLAGS = -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C
-EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTORS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw
+EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTORS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw diff_to_original.patch
if WIN32
noinst_LTLIBRARIES = libpthread.la
diff --git a/win32/contrib/pthreads/pthread.h b/win32/contrib/pthreads/pthread.h
index 31e2cf918..60973c44c 100644
--- a/win32/contrib/pthreads/pthread.h
+++ b/win32/contrib/pthreads/pthread.h
@@ -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) )