summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/Makefile.am10
-rw-r--r--src/xine-utils/xine_check.c30
-rw-r--r--src/xine-utils/xine_check.h17
-rw-r--r--src/xine-utils/xineutils.h15
4 files changed, 35 insertions, 37 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 0ce5ea9cb..cca80ad78 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -26,12 +26,12 @@ libxineutils_la_SOURCES = $(pppc_files) \
libxineutils_la_LIBADD = $(THREAD_LIBS)
-include_HEADERS = attributes.h \
+include_HEADERS = \
+ attributes.h \
compat.h \
+ xine_buffer.h \
xineutils.h \
- xine_check.h \
xmllexer.h \
- xmlparser.h \
- xine_buffer.h
+ xmlparser.h
-noinst_HEADERS = ppcasm_string.h
+noinst_HEADERS = ppcasm_string.h xine_check.h
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index 57e8a5f21..ccd3a6424 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -119,25 +119,25 @@ xine_health_check_t* xine_health_check (xine_health_check_t* hc, int check_num)
switch(check_num) {
case CHECK_KERNEL:
- hc = xine_health_check_kernel (hc);
+ hc = _x_health_check_kernel (hc);
break;
case CHECK_MTRR:
- hc = xine_health_check_mtrr (hc);
+ hc = _x_health_check_mtrr (hc);
break;
case CHECK_CDROM:
- hc = xine_health_check_cdrom (hc);
+ hc = _x_health_check_cdrom (hc);
break;
case CHECK_DVDROM:
- hc = xine_health_check_dvdrom (hc);
+ hc = _x_health_check_dvdrom (hc);
break;
case CHECK_DMA:
- hc = xine_health_check_dma (hc);
+ hc = _x_health_check_dma (hc);
break;
case CHECK_X:
- hc = xine_health_check_x (hc);
+ hc = _x_health_check_x (hc);
break;
case CHECK_XV:
- hc = xine_health_check_xv (hc);
+ hc = _x_health_check_xv (hc);
break;
default:
hc->status = XINE_HEALTH_CHECK_NO_SUCH_CHECK;
@@ -146,7 +146,7 @@ xine_health_check_t* xine_health_check (xine_health_check_t* hc, int check_num)
return hc;
}
-xine_health_check_t* xine_health_check_kernel (xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_kernel (xine_health_check_t* hc) {
struct utsname kernel;
hc->title = "Check for kernel version";
@@ -166,7 +166,7 @@ xine_health_check_t* xine_health_check_kernel (xine_health_check_t* hc) {
}
#if defined(ARCH_X86) || defined(ARCH_X86_64)
-xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_mtrr (xine_health_check_t* hc) {
char *file = "/proc/mtrr";
FILE *fd;
@@ -184,7 +184,7 @@ xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) {
return hc;
}
#else
-xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_mtrr (xine_health_check_t* hc) {
hc->title = "Check for MTRR support";
hc->explanation = "Don't worry about this one";
@@ -195,7 +195,7 @@ xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) {
}
#endif
-xine_health_check_t* xine_health_check_cdrom (xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_cdrom (xine_health_check_t* hc) {
struct stat cdrom_st;
hc->title = "Check for CDROM drive";
@@ -226,7 +226,7 @@ xine_health_check_t* xine_health_check_cdrom (xine_health_check_t* hc) {
return hc;
}
-xine_health_check_t* xine_health_check_dvdrom(xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_dvdrom(xine_health_check_t* hc) {
struct stat dvdrom_st;
@@ -258,7 +258,7 @@ xine_health_check_t* xine_health_check_dvdrom(xine_health_check_t* hc) {
return hc;
}
-xine_health_check_t* xine_health_check_dma (xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_dma (xine_health_check_t* hc) {
int is_scsi_dev = 0;
int fd = 0;
@@ -312,7 +312,7 @@ xine_health_check_t* xine_health_check_dma (xine_health_check_t* hc) {
}
-xine_health_check_t* xine_health_check_x (xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_x (xine_health_check_t* hc) {
char* env_display = getenv("DISPLAY");
hc->title = "Check for X11 environment";
@@ -328,7 +328,7 @@ xine_health_check_t* xine_health_check_x (xine_health_check_t* hc) {
return hc;
}
-xine_health_check_t* xine_health_check_xv (xine_health_check_t* hc) {
+xine_health_check_t* _x_health_check_xv (xine_health_check_t* hc) {
#ifdef HAVE_X11
#ifdef HAVE_XV
diff --git a/src/xine-utils/xine_check.h b/src/xine-utils/xine_check.h
index f61bbc75b..53778ce7e 100644
--- a/src/xine-utils/xine_check.h
+++ b/src/xine-utils/xine_check.h
@@ -14,28 +14,27 @@
* cdrom_dev = Name of the device link for the cdrom drive (e.g. /dev/cdrom)
* dvd_dev = Name of the device link for the dvd drive (e.g. /dev/dvd)
*/
-xine_health_check_t* xine_health_check(xine_health_check_t*, int check_num);
+//xine_health_check_t* xine_health_check(xine_health_check_t*, int check_num);
/* Get Kernel information */
-xine_health_check_t* xine_health_check_kernel(xine_health_check_t*);
+xine_health_check_t* _x_health_check_kernel(xine_health_check_t*);
/* health_check MTRR */
-xine_health_check_t* xine_health_check_mtrr(xine_health_check_t*);
+xine_health_check_t* _x_health_check_mtrr(xine_health_check_t*);
/* health_check CDROM */
-xine_health_check_t* xine_health_check_cdrom(xine_health_check_t*);
+xine_health_check_t* _x_health_check_cdrom(xine_health_check_t*);
/* health_check DVDROM */
-xine_health_check_t* xine_health_check_dvdrom(xine_health_check_t*);
+xine_health_check_t* _x_health_check_dvdrom(xine_health_check_t*);
/* health_check DMA settings of DVD drive*/
-xine_health_check_t* xine_health_check_dma(xine_health_check_t*);
+xine_health_check_t* _x_health_check_dma(xine_health_check_t*);
/* health_check X */
-xine_health_check_t* xine_health_check_x(xine_health_check_t*);
+xine_health_check_t* _x_health_check_x(xine_health_check_t*);
/* health_check Xv extension */
-xine_health_check_t* xine_health_check_xv(xine_health_check_t*);
+xine_health_check_t* _x_health_check_xv(xine_health_check_t*);
#endif
-
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 91e4e0d7a..3ccadba03 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.63 2003/11/04 14:38:26 valtri Exp $
+ * $Id: xineutils.h,v 1.64 2003/11/11 18:45:02 f1rmb Exp $
*
*/
#ifndef XINEUTILS_H
@@ -104,7 +104,6 @@ extern "C" {
#define MM_SSE2 MM_ACCEL_X86_SSE2
uint32_t xine_mm_accel (void);
-/* uint32_t xine_mm_support (void) ; */
#if defined(ARCH_X86) || defined(ARCH_X86_64)
@@ -661,7 +660,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 *_private_strpbrk(const char *s, const char *accept) {
while(*s != '\0') {
const char *a = accept;
@@ -673,13 +672,13 @@ static inline char *_x_strpbrk(const char *s, const char *accept) {
return NULL;
}
-#define xine_strpbrk _x_strpbrk
+#define xine_strpbrk _private_strpbrk
#endif
#if defined HAVE_STRSEP && !defined(_MSC_VER)
#define xine_strsep strsep
#else
-static inline char *_x_strsep(char **stringp, const char *delim) {
+static inline char *_private_strsep(char **stringp, const char *delim) {
char *begin, *end;
begin = *stringp;
@@ -712,14 +711,14 @@ static inline char *_x_strsep(char **stringp, const char *delim) {
return begin;
}
-#define xine_strsep _x_strsep
+#define xine_strsep _private_strsep
#endif
#ifdef HAVE_SETENV
#define xine_setenv setenv
#else
-static inline void _x_setenv(const char *name, const char *val, int _xx)
+static inline void _private_setenv(const char *name, const char *val, int _xx)
{
int len = strlen(name) + strlen(val) + 2;
char *env;
@@ -733,7 +732,7 @@ static inline void _x_setenv(const char *name, const char *val, int _xx)
putenv(env);
}
}
-#define xine_setenv _x_setenv
+#define xine_setenv _private_setenv
#endif
/*
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-29 00:55:12 +0000