summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2006-10-16 22:18:24 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2006-10-16 22:18:24 +0000
commitfd821f5c182e0c6f2da2f299b7d1341affd0914f (patch)
tree4d6765e0e45102c4a69bf114f2e6ebe38297ea8d /src/xine-utils
parenteebe97a3fe85f26ec95ad237a327ed02a2a2bfb2 (diff)
downloadxine-lib-fd821f5c182e0c6f2da2f299b7d1341affd0914f.tar.gz
xine-lib-fd821f5c182e0c6f2da2f299b7d1341affd0914f.tar.bz2
Fixed several warnings (but warnings due to APIs not solved).
CVS patchset: 8344 CVS date: 2006/10/16 22:18:24
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 */