diff options
author | Ewald Snel <esnel@users.sourceforge.net> | 2002-12-31 19:30:53 +0000 |
---|---|---|
committer | Ewald Snel <esnel@users.sourceforge.net> | 2002-12-31 19:30:53 +0000 |
commit | 88fa2176e1cf0d862dca82d44673bc8f266c5bde (patch) | |
tree | 42bff9c95e120e412c52c4af4ea2d18441a05fe8 /src | |
parent | f7931ac8783f98b4f8f2a8cffe25c60bdbb1a180 (diff) | |
download | xine-lib-88fa2176e1cf0d862dca82d44673bc8f266c5bde.tar.gz xine-lib-88fa2176e1cf0d862dca82d44673bc8f266c5bde.tar.bz2 |
Undo previous patch to fix compilation of xine-ui on Solaris
CVS patchset: 3736
CVS date: 2002/12/31 19:30:53
Diffstat (limited to 'src')
-rw-r--r-- | src/xine-utils/xineutils.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 95327b53a..a82f92c59 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xineutils.h,v 1.31 2002/12/30 20:53:05 esnel Exp $ + * $Id: xineutils.h,v 1.32 2002/12/31 19:30:53 esnel Exp $ * */ #ifndef XINEUTILS_H @@ -625,7 +625,7 @@ void xine_strdupa(char *dest, char *src); } while(0) /* Shamefully copied from glibc 2.2.3 */ -#if defined(HAVE_STRPBRK) || !defined(XINE_COMPILE) +#ifdef HAVE_STRPBRK #define xine_strpbrk strpbrk #else static inline char *_x_strpbrk(const char *s, const char *accept) { @@ -643,7 +643,7 @@ static inline char *_x_strpbrk(const char *s, const char *accept) { #define xine_strpbrk _x_strpbrk #endif -#if defined(HAVE_STRSEP) || !defined(XINE_COMPILE) +#ifdef HAVE_STRSEP #define xine_strsep strsep #else static inline char *_x_strsep(char **stringp, const char *delim) { @@ -683,7 +683,7 @@ static inline char *_x_strsep(char **stringp, const char *delim) { #endif -#if defined(HAVE_SETENV) || !defined(XINE_COMPILE) +#ifdef HAVE_SETENV #define xine_setenv setenv #else static inline void _x_setenv(const char *name, const char *val, int _xx) |