From 1379ab26f381310cd1fd34664d73a28cc9bf6eb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 1 May 2008 22:05:41 +0300 Subject: [PATCH] Remove UI64_C Turns out it was only used once in the whole tree. --- include/vlc_common.h | 1 - modules/demux/live555.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 1f59d1c945..4b9404dbdc 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -864,7 +864,6 @@ VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) ); /* 64 bits integer constant suffix */ #define I64C(x) INT64_C(x) -#define UI64C(x) UINT64_C(x) #if defined(WIN32) || defined(UNDER_CE) /* win32, cl and icl support */ diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 20a8a4f9dc..1968117073 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -1541,11 +1541,11 @@ static void StreamRead( void *p_private, unsigned int i_size, //msg_Dbg( p_demux, "pts: %d", pts.tv_sec ); - int64_t i_pts = (uint64_t)pts.tv_sec * UI64C(1000000) + + int64_t i_pts = (uint64_t)pts.tv_sec * UINT64_C(1000000) + (uint64_t)pts.tv_usec; /* XXX Beurk beurk beurk Avoid having negative value XXX */ - i_pts &= UI64C(0x00ffffffffffffff); + i_pts &= UINT64_C(0x00ffffffffffffff); if( tk->b_quicktime && tk->p_es == NULL ) { -- 2.39.2