3 files changed, 11 insertions, 11 deletions
diff --git a/src/compression/widemuldiv.c b/src/compression/widemuldiv.c
index 63056f9..46cb039 100644
--- a/src/compression/widemuldiv.c
+++ b/src/compression/widemuldiv.c
@@ -39,7 +39,7 @@
 #endif
 
 /* Multiply two 32 bit unsigned integers returning a 64 bit unsigned value (in two integers) */
-TNG_INLINE void Ptngc_widemul(unsigned int i1, unsigned int i2, unsigned int *ohi, unsigned int *olo)
+static TNG_INLINE void Ptngc_widemul(unsigned int i1, unsigned int i2, unsigned int *ohi, unsigned int *olo)
 {
 #if defined(TRAJNG_X86_GCC_INLINE_MULDIV)
   __asm__ __volatile__ ("mull %%edx\n\t"
@@ -106,7 +106,7 @@ TNG_INLINE void Ptngc_widemul(unsigned int i1, unsigned int i2, unsigned int *oh
 
 /* Divide a 64 bit unsigned value in hi:lo with the 32 bit value i and
    return the result in result and the remainder in remainder */
-TNG_INLINE void Ptngc_widediv(unsigned int hi, unsigned int lo, unsigned int i, unsigned int *result, unsigned int *remainder)
+static TNG_INLINE void Ptngc_widediv(unsigned int hi, unsigned int lo, unsigned int i, unsigned int *result, unsigned int *remainder)
 {
 #if defined(TRAJNG_X86_GCC_INLINE_MULDIV)
   __asm__ __volatile__ ("divl %%ecx\n\t"
@@ -170,7 +170,7 @@ TNG_INLINE void Ptngc_widediv(unsigned int hi, unsigned int lo, unsigned int i,
 
 /* Add a unsigned int to a largeint. j determines which value in the
    largeint to add v1 to. */
-TNG_INLINE static void largeint_add_gen(const unsigned int v1, unsigned int *largeint, const int n, int j)
+static TNG_INLINE void largeint_add_gen(const unsigned int v1, unsigned int *largeint, const int n, int j)
 {
   /* Add with carry. unsigned ints in C wrap modulo 2**bits when "overflowed". */
   unsigned int v2=(v1+largeint[j])&0xFFFFFFFFU; /* Add and cap at 32 bits */
@@ -197,7 +197,7 @@ void Ptngc_largeint_add(const unsigned int v1, unsigned int *largeint, const int
 }
 
 /* Multiply v1 with largeint_in and return result in largeint_out */
-TNG_INLINE void Ptngc_largeint_mul(const unsigned int v1, unsigned int *largeint_in, unsigned int *largeint_out, const int n)
+void Ptngc_largeint_mul(const unsigned int v1, unsigned int *largeint_in, unsigned int *largeint_out, const int n)
 {
   int i;
   unsigned int lo,hi;
@@ -221,7 +221,7 @@ TNG_INLINE void Ptngc_largeint_mul(const unsigned int v1, unsigned int *largeint
 }
 
 /* Return the remainder from dividing largeint_in with v1. Result of the division is returned in largeint_out */
-TNG_INLINE unsigned int Ptngc_largeint_div(const unsigned int v1, unsigned int *largeint_in, unsigned int *largeint_out, const int n)
+unsigned int Ptngc_largeint_div(const unsigned int v1, unsigned int *largeint_in, unsigned int *largeint_out, const int n)
 {
   unsigned int result,remainder=0;
   int i;
diff --git a/src/compression/xtc2.c b/src/compression/xtc2.c
index d5a13a4..888ff8d 100644
--- a/src/compression/xtc2.c
+++ b/src/compression/xtc2.c
@@ -176,7 +176,7 @@ int Ptngc_magic(unsigned int i)
   return magic[i];
 }
 
-TNG_INLINE int Ptngc_find_magic_index(const unsigned int maxval)
+int Ptngc_find_magic_index(const unsigned int maxval)
 {
   int i;
 
@@ -201,7 +201,7 @@ TNG_INLINE int Ptngc_find_magic_index(const unsigned int maxval)
   return i;
 }
 
-TNG_INLINE static unsigned int positive_int(const int item)
+static TNG_INLINE unsigned int positive_int(const int item)
 {
   int s=0;
   if (item>0)
@@ -211,7 +211,7 @@ TNG_INLINE static unsigned int positive_int(const int item)
   return s;
 }
 
-TNG_INLINE static int unpositive_int(const int val)
+static TNG_INLINE int unpositive_int(const int val)
 {
   int s=(val+1)/2;
   if ((val%2)==0)
diff --git a/src/compression/xtc3.c b/src/compression/xtc3.c
index 673b321..7b493ab 100644
--- a/src/compression/xtc3.c
+++ b/src/compression/xtc3.c
@@ -68,9 +68,9 @@ static const double iflipgaincheck=0.89089871814033927; /*  1./(2**(1./6)) */
 
 /* These routines are in xtc2.c */
 int Ptngc_magic(unsigned int i);
-int Ptngc_find_magic_index(unsigned int maxval);
+int Ptngc_find_magic_index(const unsigned int maxval);
 
-TNG_INLINE static unsigned int positive_int(int item)
+static TNG_INLINE unsigned int positive_int(int item)
 {
   int s=0;
   if (item>0)
@@ -80,7 +80,7 @@ TNG_INLINE static unsigned int positive_int(int item)
   return s;
 }
 
-TNG_INLINE static int unpositive_int(int val)
+static TNG_INLINE int unpositive_int(int val)
 {
   int s=(val+1)/2;
   if ((val%2)==0)