summaryrefslogtreecommitdiff
path: root/libavutil/common.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-11-01 17:01:33 +0000
committerDiego Biurrun <diego@biurrun.de>2006-11-01 17:01:33 +0000
commit419b878494346c2f9d81f23d7a75cbe03eb5dab0 (patch)
tree2d410c6064c50c43ebb2b69444a7ddb2f730034a /libavutil/common.h
parent6c02f9e7ee00d6a08c75a793546ea2e89b502a24 (diff)
Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change
the semantics of ARCH_X86 to mean both 32 and 64 bits. Originally committed as revision 6852 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/common.h')
-rw-r--r--libavutil/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index 3ae59716e4..bb049e9628 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -344,7 +344,7 @@ static inline uint64_t read_time(void)
);
return (d << 32) | (a & 0xffffffff);
}
-#elif defined(ARCH_X86)
+#elif defined(ARCH_X86_32)
static inline long long read_time(void)
{
long long l;