shithub: opus

Info  •  Files  •  Log  •  Branches

update mkfile flags and workaround for VOID vs INT value in macro

--- a/celt/stack_alloc.h

+++ b/celt/stack_alloc.h

@@ -142,7 +142,7 @@

 #include "arch.h"

 #define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))

-#define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)/(sizeof(char))),(void)(((int)((size)*(sizeof(type)/(sizeof(char)))) <= (scratch_ptr)+GLOBAL_STACK_SIZE-(stack))?0:CELT_FATAL("pseudostack overflow")),(stack)+=(size)*(sizeof(type)/(sizeof(char))),(type*)((stack)-(size)*(sizeof(type)/(sizeof(char)))))

+#define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)/(sizeof(char))),(void)(((int)((size)*(sizeof(type)/(sizeof(char)))) <= (scratch_ptr)+GLOBAL_STACK_SIZE-(stack))?0:(CELT_FATAL("pseudostack overflow"),0)),(stack)+=(size)*(sizeof(type)/(sizeof(char))),(type*)((stack)-(size)*(sizeof(type)/(sizeof(char)))))

 #if 0 /* Set this to 1 to instrument pseudostack usage */

 #define RESTORE_STACK (printf("%ld %s:%d\n", global_stack-scratch_ptr, __FILE__, __LINE__),global_stack = _saved_stack)

 #else

--- a/mkfile

+++ b/mkfile

@@ -132,6 +132,7 @@

 	vq.$O \

 # src \

 	analysis.$O \

+	extensions.$O \

 	mlp.$O \

 	mlp_data.$O \

 	opus.$O \

@@ -165,7 +166,9 @@

 	-DOPUS_BUILD \

 	-DCUSTOM_MODES \

 	-DNONTHREADSAFE_PSEUDOSTACK \

-	-DHAVE_STDINT_H

+	-DHAVE_STDINT_H \

+	-DENABLE_HARDENING \

+	-DENABLE_FLOAT_API \

 %.$O:	silk/%.c

 	$CC $CFLAGS silk/$stem.c

-- 

⑨