diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-09-20 19:30:02 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-09-20 19:30:02 +0000 |
| commit | 7204b84beb0f5cfb166e8d56402371d05bece83b (patch) | |
| tree | 16b76662489bd637b04e06e5ee6ca1ea98186dec /win32/contrib/pthreads | |
| parent | 747ab57ec201661d72adfdf0ce538d728c0013c5 (diff) | |
| download | xine-lib-7204b84beb0f5cfb166e8d56402371d05bece83b.tar.gz xine-lib-7204b84beb0f5cfb166e8d56402371d05bece83b.tar.bz2 | |
Build system improvements:
- use replacement functions (macro AC_REPLACE_FUNCS and variable LTLIBOBJS),
each function is in a file placed into lib/ directory,
it was not necessary, but it looks nice, IMHO
- headers cleanups (this was needed):
- prototypes of replacement funtions and macros are placed
into separate os_internal.h (and included by config.h)
- drop include inttypes.h from public xine.h, replaced by custom
os_type.h, idea origins from Ogg/Vorbis public headers
- disable generating inttypes.h: generated replacement isn't enough for
xine-lib but nobody complained (and for M$VC we have special version)
- better including headers for win32, let dvdnav use its mutex wrapper
- updated M$VC port
Result:
- xine is compiled nicely by MinGW, CygWin and paritaly M$VC
- frontends in M$VC port don't require additional helping headers
- moved some platform specific things from xine-utils and win32/contrib
to lib/
Finally I can start with real coding. :-)
CVS patchset: 6982
CVS date: 2004/09/20 19:30:02
Diffstat (limited to 'win32/contrib/pthreads')
| -rw-r--r-- | win32/contrib/pthreads/Makefile.am | 2 | ||||
| -rw-r--r-- | win32/contrib/pthreads/pthread.h | 5 |
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) )
|