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

[fw/altos] / src / test / ao_int64_test.c

diff --git a/src/test/ao_int64_test.c b/src/test/ao_int64_test.c
index 8557a1c79648b2538622d4c79562fb7a4b416bfa..c7a4891f90bbd57aa6e306f37858c9e247385c4d 100644 (file)
--- a/src/test/ao_int64_test.c
+++ b/src/test/ao_int64_test.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
@@ -15,10 +16,6 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#define __data
-#define __pdata
-#define __xdata
-#define __reentrant
 
 #include <ao_int64.h>
 #include <ao_int64.c>
@@ -33,7 +30,7 @@ int   errors;
                c = ao_cast64(&ao_r);                                   \
                if (c != r) {                                           \
                        printf ("trial %4d: %lld " #func mod " %lld = %lld (should be %lld)\n", \
-                               trial, (int64_t) (a), (int64_t) b, c, r); \
+                               trial, (long long) (a), (long long) b, (long long) c, (long long) r); \
                        ++errors;                                       \
                }                                                       \
        } while (0)