Commit ce7e2514 authored by Michael Pyne's avatar Michael Pyne
Browse files

Final merge from Ariya's fixes. This appears to avoid conflicting with global reserved

include definition.

svn path=/trunk/playground/utils/abakus/; revision=472161
parent bf6ae0a8
...@@ -1442,7 +1442,7 @@ void ...@@ -1442,7 +1442,7 @@ void
bc_out_long (val, size, space, out_char) bc_out_long (val, size, space, out_char)
long val; long val;
int size, space; int size, space;
#ifdef __STDC__ #ifdef NUMBER__STDC__
void (*out_char)(int); void (*out_char)(int);
#else #else
void (*out_char)(); void (*out_char)();
...@@ -1470,7 +1470,7 @@ void ...@@ -1470,7 +1470,7 @@ void
bc_out_num (num, o_base, out_char, leading_zero) bc_out_num (num, o_base, out_char, leading_zero)
bc_num num; bc_num num;
int o_base; int o_base;
#ifdef __STDC__ #ifdef NUMBER__STDC__
void (*out_char)(int); void (*out_char)(int);
#else #else
void (*out_char)(); void (*out_char)();
......
...@@ -38,8 +38,8 @@ extern "C" { ...@@ -38,8 +38,8 @@ extern "C" {
#undef _PROTOTYPE #undef _PROTOTYPE
#ifndef __STDC__ #ifndef NUMBER__STDC__
#define __STDC__ #define NUMBER__STDC__
#endif #endif
typedef enum {PLUS, MINUS} sign; typedef enum {PLUS, MINUS} sign;
...@@ -102,7 +102,7 @@ extern bc_num _two_; ...@@ -102,7 +102,7 @@ extern bc_num _two_;
/* Define the _PROTOTYPE macro if it is needed. */ /* Define the _PROTOTYPE macro if it is needed. */
#ifndef _PROTOTYPE #ifndef _PROTOTYPE
#ifdef __STDC__ #ifdef NUMBER__STDC__
#define _PROTOTYPE(func, args) func args #define _PROTOTYPE(func, args) func args
#else #else
#define _PROTOTYPE(func, args) func() #define _PROTOTYPE(func, args) func()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment