From 9afd2f70abc32263a8209597c0bf38587e8499ba Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Fri, 21 May 2004 14:48:04 +0000 Subject: [PATCH] gst/gstcpu.c (gst_cpuid_i386): Protect some gcc asm stuff with __GNUC__, patch from Brian Cameron, fixes bug #142804 Original commit message from CVS: * gst/gstcpu.c (gst_cpuid_i386): Protect some gcc asm stuff with __GNUC__, patch from Brian Cameron, fixes bug #142804 --- ChangeLog | 5 +++++ gst/gstcpu.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cbc8908ef..cee9acbb8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-21 Johan Dahlin + + * gst/gstcpu.c (gst_cpuid_i386): Protect some gcc asm stuff with + __GNUC__, patch from Brian Cameron, fixes bug #142804 + 2004-05-20 David Schleef * gst/gstindex.c: (gst_index_compare_func): Fix overflows in diff --git a/gst/gstcpu.c b/gst/gstcpu.c index 9c7cf2d723..8824309467 100644 --- a/gst/gstcpu.c +++ b/gst/gstcpu.c @@ -30,7 +30,7 @@ static guint32 _gst_cpu_flags = 0; -#ifdef HAVE_CPU_I386 +#if defined(HAVE_CPU_I386) && defined(__GNUC__) #define _gst_cpu_initialize_arch _gst_cpu_initialize_i386 gboolean _gst_cpu_initialize_i386 (gulong * flags, GString * featurelist); #else @@ -62,7 +62,7 @@ _gst_cpu_initialize_none (gulong * flags, GString * featurelist) return FALSE; } -#ifdef HAVE_CPU_I386 +#if defined(HAVE_CPU_I386) && defined(__GNUC__) static void gst_cpuid_i386 (int x, unsigned long *eax, unsigned long *ebx, unsigned long *ecx, unsigned long *edx)