Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / kernel / ao_convert.c

diff --git a/src/kernel/ao_convert.c b/src/kernel/ao_convert.c
index db1f2301d2c9ecaffc18b0f67f661b08b74d683a..f3e523ecefe02ed430b6332b5497fe7a075212eb 100644 (file)
--- a/src/kernel/ao_convert.c
+++ b/src/kernel/ao_convert.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,7 +30,7 @@ static const ao_v_t altitude_table[] = {
 #define ALT_FRAC_MASK  (ALT_FRAC_SCALE - 1)
 
 ao_v_t
-ao_pres_to_altitude(int16_t pres) __reentrant
+ao_pres_to_altitude(int16_t pres) 
 {
        uint8_t o;
        int16_t part;
@@ -45,7 +46,7 @@ ao_pres_to_altitude(int16_t pres) __reentrant
 
 #if AO_NEED_ALTITUDE_TO_PRES
 int16_t
-ao_altitude_to_pres(ao_v_t alt) __reentrant
+ao_altitude_to_pres(ao_v_t alt) 
 {
        ao_v_t span, sub_span;
        uint8_t l, h, m;
@@ -73,7 +74,7 @@ ao_altitude_to_pres(ao_v_t alt) __reentrant
 
 #if 0
 int16_t
-ao_temp_to_dC(int16_t temp) __reentrant
+ao_temp_to_dC(int16_t temp) 
 {
        int16_t ret;