2 files changed, 5 insertions, 3 deletions

diff --git a/apps/codecs/lib/setjmp.h b/apps/codecs/lib/setjmp.h
index 4bcf6af623..91571b9f84 100644
--- a/apps/codecs/lib/setjmp.h
+++ b/apps/codecs/lib/setjmp.h
@@ -24,8 +24,8 @@
 #define _JBLEN  34
 #endif
 
-#ifdef __mips__
-#ifdef __mips64
+#ifdef CPU_MIPS
+#if CPU_MIPS == 64
 #define _JBTYPE long long
 #endif
 #ifdef __mips_soft_float
diff --git a/apps/codecs/lib/setjmp_mips.S b/apps/codecs/lib/setjmp_mips.S
index 69799a005c..ccb83bd596 100644
--- a/apps/codecs/lib/setjmp_mips.S
+++ b/apps/codecs/lib/setjmp_mips.S
@@ -1,3 +1,5 @@
+#include "config.h"
+
 /* This is a simple version of setjmp and longjmp for MIPS 32 and 64.
 
    Ian Lance Taylor, Cygnus Support, 13 May 1993.  */
@@ -40,7 +42,7 @@
 #define FPR_LAYOUT
 #endif
 
-#ifdef __mips64
+#if CPU_MIPS == 64
 #define BYTES_PER_WORD 8
 #define LOAD_GPR ld
 #define LOAD_FPR ldc1