X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=shamirs;a=blobdiff_plain;f=shamirssecret.c;h=f440f49f21d7d2d9d7413f048b8cc546b38c0536;hp=2d6e7aac0c9a77bc41d9fc12465fd400bf82a2e6;hb=29918d3171bc7ca0f038da5385105adb9a3aaf00;hpb=f76ba5528394212f4b95427c3aaac9a91a8acb1e

diff --git a/shamirssecret.c b/shamirssecret.c
index 2d6e7aa..f440f49 100644
--- a/shamirssecret.c
+++ b/shamirssecret.c
@@ -17,18 +17,20 @@
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include <stdint.h>
-
 #ifndef IN_KERNEL
 #include <assert.h>
 #define CHECKSTATE(x) assert(x)
 #else
 #include <linux/bug.h>
-#define CHECKSTATE(x) BUG_ON(x)
+#define CHECKSTATE(x) BUG_ON(!(x))
 #endif
 
 #include "shamirssecret.h"
 
+#ifndef noinline
+#define noinline __attribute__((noinline))
+#endif
+
 /*
  * Calculations across the finite field GF(2^8)
  */
@@ -87,7 +89,7 @@ static const uint8_t log[P] = {
 	0x4a, 0xed, 0xde, 0xc5, 0x31, 0xfe, 0x18, 0x0d, 0x63, 0x8c, 0x80, 0xc0, 0xf7, 0x70, 0x07};
 
 // We disable lots of optimizations that result in non-constant runtime (+/- branch delays)
-static uint8_t field_mul_ret(uint8_t calc, uint8_t a, uint8_t b) __attribute__((optimize("-O0"))) __attribute__((noinline));
+static uint8_t field_mul_ret(uint8_t calc, uint8_t a, uint8_t b) __attribute__((optimize("-O0"))) noinline;
 static uint8_t field_mul_ret(uint8_t calc, uint8_t a, uint8_t b) {
 	uint8_t ret, ret2;
 	if (a == 0)
@@ -110,7 +112,7 @@ static uint8_t field_invert(uint8_t a) {
 }
 
 // We disable lots of optimizations that result in non-constant runtime (+/- branch delays)
-static uint8_t field_pow_ret(uint8_t calc, uint8_t a, uint8_t e) __attribute__((optimize("-O0"))) __attribute__((noinline));
+static uint8_t field_pow_ret(uint8_t calc, uint8_t a, uint8_t e) __attribute__((optimize("-O0"))) noinline;
 static uint8_t field_pow_ret(uint8_t calc, uint8_t a, uint8_t e) {
 	uint8_t ret, ret2;
 	if (a == 0)