Switch from GPLv2 to GPLv2+

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

diff --git a/src/kernel/ao_int64.c b/src/kernel/ao_int64.c
index aa23dbe0f9cc27d37ff7a821cb20ec8f5c64105f..fdea61c031f726b0c692b379cb8d8263fd994a6c 100644 (file)
--- a/src/kernel/ao_int64.c
+++ b/src/kernel/ao_int64.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
@@ -17,8 +18,6 @@
 
 #include <ao_int64.h>
 
-__pdata ao_int64_t *__data ao_64r, *__data ao_64a, *__data ao_64b;
-
 void ao_plus64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, __pdata ao_int64_t *b) __FATTR {
        __LOCAL uint32_t        t;
 
@@ -151,8 +150,8 @@ void ao_mul64_64_16(__ARG ao_int64_t *r, __ARG ao_int64_t *a, __ARG uint16_t b)
                ao_neg64(&ap, a);
                a = &ap;
                negative++;
-       } else
-               ao_umul64_64_16(r, a, b);
+       }
+       ao_umul64_64_16(r, a, b);
        if (negative)
                ao_neg64(r, r);
 }