diff options
author | František Dvořák <valtri@users.sourceforge.net> | 2004-08-27 19:33:17 +0000 |
---|---|---|
committer | František Dvořák <valtri@users.sourceforge.net> | 2004-08-27 19:33:17 +0000 |
commit | e46ac635c2c28d80706f02f239bb847c7e48c34b (patch) | |
tree | edfd3169ae1ca48fbf36d7d1c6b61ccdfe50d01b /src/xine-utils/memcpy.c | |
parent | 2d5b782a786e81f3ee364210278747d8d338f065 (diff) | |
download | xine-lib-e46ac635c2c28d80706f02f239bb847c7e48c34b.tar.gz xine-lib-e46ac635c2c28d80706f02f239bb847c7e48c34b.tar.bz2 |
MINGW32 port. Engine library and most of plugins compiles now.
List of some changes:
- replaced some _MSC_VER by more common WIN32
- define INTLDIR, remove -static flag for included intl
- shared more common CFLAGS with DEBUG_CFLAGS
- use WIN32_CFLAGS for all building
- separate some flags into THREAD_CFLAGS_CONFIG,
THREAD_CFLAGS_CONFIG and ZLIB_LIB_CONFIG for public xine-config,
automatically use internal libs if necessary
- don't warn about missing X for mingw and cygwin
- libw32dll disabled for WIN32 (making native loader would be
interesting, or porting wine code to Windows? :->)
- DVB and RTP disabled for WIN32, not ported yet
- fix build and fix a warning in cdda
- fix build for nosefart and libfaad
- implement configure option --disable-freetype
- sync libxine.pc and xine-config.in
- add -liberty to goom under WIN32
- move original build files from included phread and zlib into archives
and replace them by autotools
CVS patchset: 6910
CVS date: 2004/08/27 19:33:17
Diffstat (limited to 'src/xine-utils/memcpy.c')
-rw-r--r-- | src/xine-utils/memcpy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index e49398f48..79a74c9d5 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2003 the xine project + * Copyright (C) 2001-2004 the xine project * * This file is part of xine, a free video player. * @@ -37,7 +37,7 @@ #include "ppcasm_string.h" #endif -#ifndef _MSC_VER +#ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif @@ -408,7 +408,7 @@ static struct { { NULL, NULL, 0, 0 } }; -#if defined(ARCH_X86) && !defined(_MSC_VER) +#if defined(ARCH_X86) && defined(HAVE_SYS_TIMES_H) static unsigned long long int rdtsc(int config_flags) { unsigned long long int x; @@ -427,12 +427,12 @@ static uint64_t rdtsc(int config_flags) { /* FIXME: implement an equivalent for using optimized memcpy on other architectures */ -#ifndef _MSC_VER +#ifdef HAVE_SYS_TIMES_H struct tms tp; return times(&tp); #else return ((uint64_t)0); -#endif /* _MSC_VER */ +#endif /* HAVE_SYS_TIMES_H */ } #endif |