summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2002-10-24 15:49:56 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2002-10-24 15:49:56 +0000
commit0270bd6a95d9fe507c54212993b4fcf1a343091b (patch)
treecc21e171aac02d10bb144dbc83815771f86d3715
parentb30e43b28b3d17b1c92fa72fae938c7ed8ac4755 (diff)
downloadxine-lib-0270bd6a95d9fe507c54212993b4fcf1a343091b.tar.gz
xine-lib-0270bd6a95d9fe507c54212993b4fcf1a343091b.tar.bz2
let configure determine if we the compiler needs inline, __inline, __inline__,
or /*nothing*/ We already get a '#define inline __inline__' in config.h, when xine-lib is configured with CC="gcc -ansi -pedantic" CVS patchset: 2986 CVS date: 2002/10/24 15:49:56
-rw-r--r--src/xine-utils/xineutils.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index ea4c45e4f..d7e711e26 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.24 2002/10/23 20:26:35 guenter Exp $
+ * $Id: xineutils.h,v 1.25 2002/10/24 15:49:56 jkeil Exp $
*
*/
#ifndef XINEUTILS_H
@@ -623,7 +623,7 @@ void xine_strdupa(char *dest, char *src);
#ifdef HAVE_STRPBRK
#define xine_strpbrk strpbrk
#else
-static __inline__ char *_x_strpbrk(const char *s, const char *accept) {
+static inline char *_x_strpbrk(const char *s, const char *accept) {
while(*s != '\0') {
const char *a = accept;
@@ -641,7 +641,7 @@ static __inline__ char *_x_strpbrk(const char *s, const char *accept) {
#ifdef HAVE_STRSEP
#define xine_strsep strsep
#else
-static __inline__ char *_x_strsep(char **stringp, const char *delim) {
+static inline char *_x_strsep(char **stringp, const char *delim) {
char *begin, *end;
begin = *stringp;
@@ -681,7 +681,7 @@ static __inline__ char *_x_strsep(char **stringp, const char *delim) {
#ifdef HAVE_SETENV
#define xine_setenv setenv
#else
-static __inline__ void _x_setenv(const char *name, const char *val, int _xx)
+static inline void _x_setenv(const char *name, const char *val, int _xx)
{
int len = strlen(name) + strlen(val) + 2;
char *env;