From: David Flynn <[EMAIL PROTECTED]>
If SCHRO_ARITH_DEFINE_INLINE is not [globally] set, symbols are found
in schroarith.c
TODO: maybe this is better replaced with schroarith-inline.c which
gets #included either in the header or in the .c file
Signed-off-by: David Flynn <[EMAIL PROTECTED]>
---
schroedinger/schroarith.c | 15 +++++++--------
schroedinger/schroarith.h | 6 +++++-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/schroedinger/schroarith.c b/schroedinger/schroarith.c
index 3d7d34b..e5c9847 100644
--- a/schroedinger/schroarith.c
+++ b/schroedinger/schroarith.c
@@ -266,13 +266,7 @@ arith->range[0] |= ((1<<i)-1);
}
-#if 0
-int
-_schro_arith_decode_bit (SchroArith *arith, unsigned int i)
-{
- return __schro_arith_decode_bit (arith, i);
-}
-
+#ifndef SCHRO_ARITH_DEFINE_INLINE
#define faster
#ifdef faster
static int
@@ -367,6 +361,11 @@ __schro_arith_decode_bit (SchroArith *arith, unsigned int
i)
return value;
}
#endif
+int
+_schro_arith_decode_bit (SchroArith *arith, unsigned int i)
+{
+ return __schro_arith_decode_bit (arith, i);
+}
#endif
void
@@ -538,7 +537,7 @@ schro_arith_estimate_sint (SchroArith *arith, int
cont_context,
}
#endif
-#if 0
+#ifndef SCHRO_ARITH_DEFINE_INLINE
int
_schro_arith_decode_uint (SchroArith *arith, unsigned int cont_context,
unsigned int value_context)
diff --git a/schroedinger/schroarith.h b/schroedinger/schroarith.h
index 6a5a848..a250fc0 100644
--- a/schroedinger/schroarith.h
+++ b/schroedinger/schroarith.h
@@ -215,7 +215,11 @@ _schro_arith_decode_uint (SchroArith *arith, unsigned int
cont_context,
}
return bits - 1;
}
-#endif
+#else /* SCHRO_ARITH_DEFINE_INLINE */
+int _schro_arith_decode_bit (SchroArith *arith, unsigned int context);
+int _schro_arith_decode_uint (SchroArith *arith, unsigned int cont_context,
+ unsigned int value_context);
+#endif /* SCHRO_ARITH_DEFINE_INLINE */
#endif
--
1.5.5
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Schrodinger-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/schrodinger-devel
