summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/memcpy.c4
-rw-r--r--src/xine-utils/xine_check.c3
-rw-r--r--src/xine-utils/xineutils.h4
3 files changed, 5 insertions, 6 deletions
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index 68cc82aa2..15301f108 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -407,9 +407,9 @@ static struct {
};
#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && defined(HAVE_SYS_TIMES_H)
-static unsigned long long int rdtsc(int config_flags)
+static int64_t rdtsc(int config_flags)
{
- unsigned long long int x;
+ int64_t x;
/* that should prevent us from trying cpuid with old cpus */
if( config_flags & MM_MMX ) {
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index 7bbf645ff..43e046a45 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -81,7 +81,6 @@ set_hc_result(xine_health_check_t* hc, int state, const char *format, ...)
va_list args;
char *buf = NULL;
- int n, size;
if (!hc) {
printf ("xine_check: GASP, hc is NULL\n");
@@ -94,7 +93,7 @@ set_hc_result(xine_health_check_t* hc, int state, const char *format, ...)
}
va_start(args, format);
- asprintf (&buf, format, args);
+ vasprintf (&buf, format, args);
va_end(args);
if (!buf)
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index b4e3d1ff8..15f771da0 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.104 2006/09/26 07:48:57 dgp85 Exp $
+ * $Id: xineutils.h,v 1.105 2006/10/16 22:18:24 valtri Exp $
*
*/
#ifndef XINEUTILS_H
@@ -868,7 +868,7 @@ void xine_hexdump (const char *buf, int length) XINE_PROTECTED;
#define lprintf(fmt, args...) do {} while(0)
#else
#ifdef _MSC_VER
-void __inline lprintf(const char * fmt, ...) {};
+void __inline lprintf(const char * fmt, ...) {}
#else
#define lprintf(...) do {} while(0)
#endif /* _MSC_VER */