diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/os_internal.h | 2 | ||||
| -rw-r--r-- | lib/os_types.h | 109 | ||||
| -rw-r--r-- | lib/strtok_r.c | 8 |
4 files changed, 5 insertions, 115 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index c6462037e..931c411ac 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -6,7 +6,6 @@ EXTRA_DIST = Makefile.common noinst_LTLIBRARIES = libxineposix.la noinst_HEADERS = os_internal.h -xineinclude_HEADERS = os_types.h libxineposix_la_SOURCES = libxineposix_la_LIBADD = @LTLIBOBJS@ diff --git a/lib/os_internal.h b/lib/os_internal.h index f84bb1e62..873c4c3b7 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -81,7 +81,7 @@ #include <inttypes.h> #include <pthread.h> -#include "../src/xine-utils/attributes.h" +#include <xine/attributes.h> #if defined(WIN32) || defined(__CYGWIN__) diff --git a/lib/os_types.h b/lib/os_types.h deleted file mode 100644 index 75ce9b8a5..000000000 --- a/lib/os_types.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (C) 2004-2006 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * Platform dependent types needed by public xine.h. - * Types not needed by xine.h are specified in os_internal.h. - * - * Heavily based on os_types.h from OggVorbis (BSD License), - * not tested on all platforms with xine. - */ - -#ifndef XINE_OS_TYPES_H -#define XINE_OS_TYPES_H - -#if defined(_WIN32) && !defined(__GNUC__) - - /* MSVC/Borland */ - typedef __int8 int8_t; - typedef unsigned __int8 uint8_t; - typedef __int16 int16_t; - typedef unsigned __int16 uint16_t; - typedef __int32 int32_t; - typedef unsigned __int32 uint32_t; - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; - -#elif defined(__MACOS__) - -# include <sys/types.h> - typedef SInt8 int8_t; - typedef UInt8 uint8_t; - typedef SInt16 int16_t; - typedef UInt16 uint16_t; - typedef SInt32 int32_t; - typedef UInt32 uint32_t; - typedef SInt64 int64_t; - typedef UInt64 uint64_t; - -#elif defined(__MACOSX__) /* MacOS X Framework build */ - -# include <sys/types.h> - typedef u_int8_t uint8_t; - typedef u_int16_t uint16_t; - typedef u_int32_t uint32_t; - typedef u_int64_t uint64_t; - -#elif defined (__EMX__) - - /* OS/2 GCC */ - typedef signed char int8_t; - typedef unsigned char uint8_t; - typedef short int16_t; - typedef unsigned short uint16_t; - typedef int int32_t; - typedef unsigned int uint32_t; - typedef long long int64_t; - typedef unsigned long long int64_t; - -#elif defined (DJGPP) - - /* DJGPP */ - typedef signed char int8_t; - typedef unsigned char uint8_t; - typedef short int16_t; - typedef unsigned short uint16_t; - typedef int int32_t; - typedef unsigned int uint32_t; - typedef long long int64_t; - typedef unsigned long long uint64_t; - -#elif defined(R5900) - - /* PS2 EE */ - typedef signed char int8_t; - typedef unsigned char uint8_t; - typedef short int16_t; - typedef unsigned short int16_t; - typedef int int32_t; - typedef unsigned uint32_t; - typedef long int64_t; - typedef unsigned long int64_t; - -#else - - /* - * CygWin: _WIN32 & __GNUC__ - * BeOS: __BEOS__ - * Linux, Solaris, Mac and others - */ -# include <inttypes.h> - -#endif - -#endif /* XINE_OS_TYPES_H */ diff --git a/lib/strtok_r.c b/lib/strtok_r.c index cead029a2..8a5284a42 100644 --- a/lib/strtok_r.c +++ b/lib/strtok_r.c @@ -19,7 +19,7 @@ char *xine_private_strtok_r(char *s, const char *delim, char **ptrptr) { else s = *ptrptr; /* end of searching */ - if (!s || s == '\0') return NULL; + if (!s || !*s) return NULL; /* cut the initial garbage */ cutlen = strspn(s, delim); @@ -32,12 +32,12 @@ char *xine_private_strtok_r(char *s, const char *delim, char **ptrptr) { } next = s + toklen; + /* prepare next call */ + *ptrptr = *next ? next + 1 : NULL; + /* cut current token */ *next = '\0'; - /* prepare next call */ - *ptrptr = next + 1; - /* return the token */ return s; } |