zfec: silence a warning when compiling on Mac OS X with gcc, and refactor a complicat...

darcs-hash:89e84b89db0085a83eb17f4e0c104846db996354

diff --git a/zfec/zfec/_fecmodule.c b/zfec/zfec/_fecmodule.c
index f766321dba01c83756802c0729caafd66169b245..63b07cb6dedc739c3e7eaf78fb9fe2222e5eb917 100644 (file)
--- a/zfec/zfec/_fecmodule.c
+++ b/zfec/zfec/_fecmodule.c
@@ -13,22 +13,6 @@ typedef int Py_ssize_t;
 
 #include "stdarg.h"
 
-#if defined(_MSC_VER)
-// actually, some of the flavors (i.e. Enterprise) do support restrict
-//#define restrict __restrict
-#define restrict
-#define inline __inline
-#define alloca _alloca
-#else
-#ifdef __GNUC__
-#define alloca(x) __builtin_alloca(x)
-#else
-#include <alloca.h>
-#endif
-#endif
-
-
-
 static PyObject *py_fec_error;
 
 static char fec__doc__[] = "\

diff --git a/zfec/zfec/fec.c b/zfec/zfec/fec.c
index 0fb2f1b98e48fd30628a54b79bb4c2c73d0dcd3d..9b1e5fa343e4586967330446e9f7514899f0863f 100644 (file)
--- a/zfec/zfec/fec.c
+++ b/zfec/zfec/fec.c
@@ -9,21 +9,6 @@
 #include <string.h>
 #include <assert.h>
 
-#if defined(_MSC_VER)
-// actually, some of the flavors (i.e. Enterprise) do support restrict
-//#define restrict __restrict
-#define restrict
-#define inline __inline
-#define alloca _alloca
-#else
-#ifdef __GNUC__
-#define alloca(x) __builtin_alloca(x)
-#else
-#include <alloca.h>
-#endif
-#endif
-
-
 /*
  * Primitive polynomials - see Lin & Costello, Appendix A,
  * and  Lee & Messerschmitt, p. 453.

diff --git a/zfec/zfec/fec.h b/zfec/zfec/fec.h
index e9f11081b4e900ad34dac9cab8ed7b2166b929e0..4004b7252ae7a2fcd22ecb290d6324e8678e683d 100644 (file)
--- a/zfec/zfec/fec.h
+++ b/zfec/zfec/fec.h
@@ -36,6 +36,21 @@ void fec_encode(const fec_t* code, const gf*restrict const*restrict const src, g
  */
 void fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf*restrict const*restrict const outpkts, const unsigned*restrict const index, size_t sz);
 
+#if defined(_MSC_VER)
+// actually, some of the flavors (i.e. Enterprise) do support restrict
+//#define restrict __restrict
+#define restrict
+#define inline __inline
+#define alloca _alloca
+#else
+#ifdef __GNUC__
+#ifndef alloca
+#define alloca(x) __builtin_alloca(x)
+#endif
+#else
+#include <alloca.h>
+#endif
+#endif
 
 /**
  * zfec -- fast forward error correction library with Python interface