diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-09-23 13:15:29 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-09-23 13:15:29 +0000 |
commit | 0956d119432ff6a2e85bae1fa336df799cad70b0 (patch) | |
tree | 7ab1b1b6d5c5bd7effdad00cbf20114b9e0f2aaf /bc/bcdefs.h | |
parent | 5439ab7459283bf61a0256c3a20df164c780ef6c (diff) | |
parent | d30971a0f40d716b644eecbd1d874742d84d57fd (diff) | |
download | bc-tarball-baserock/morph.tar.gz |
Merge branch 'baserock/liw/S8700-bc-segfault' into baserock/morphbaserock/morph
Reviewed-by: Jonathan Maw
Reviewed-by: Richard Maw
Diffstat (limited to 'bc/bcdefs.h')
-rw-r--r-- | bc/bcdefs.h | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/bc/bcdefs.h b/bc/bcdefs.h index 260cd12..29c4d52 100644 --- a/bc/bcdefs.h +++ b/bc/bcdefs.h @@ -1,7 +1,6 @@ -/* bcdefs.h: The single file to include all constants and type definitions. */ - /* This file is part of GNU bc. - Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc. + + Copyright (C) 1991-1994, 1997, 2006 Free Software Foundation, Inc. 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 @@ -14,10 +13,10 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to + along with this program; see the file COPYING. If not, write to: The Free Software Foundation, Inc. - 59 Temple Place, Suite 330 - Boston, MA 02111 USA + Foundation, Inc. 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA You may contact the author by: e-mail: philnelson@acm.org @@ -28,6 +27,8 @@ *************************************************************************/ +/* bcdefs.h: The single file to include all constants and type definitions. */ + /* Include the configuration file. */ #include "config.h" @@ -35,10 +36,10 @@ #include <stdio.h> #include <sys/types.h> #include <ctype.h> -#ifdef HAVE_STRINGS_H -#include <strings.h> -#else +#ifdef HAVE_STRING_H #include <string.h> +#else +#include <strings.h> #endif #ifdef HAVE_LIMITS_H #include <limits.h> @@ -53,6 +54,15 @@ #include <readline/history.h> #endif +/* Initialization magic ... */ +#ifdef _GLOBAL_C +#define EXTERN +#define INIT(x) = x +#else +#define EXTERN extern +#define INIT(x) +#endif + /* Include the other definitions. */ #include "const.h" #include "number.h" @@ -90,6 +100,7 @@ typedef struct arg_list typedef struct { char f_defined; /* Is this function defined yet. */ + char f_void; /* Is this function a void function. */ char *f_body; int f_body_size; /* Size of body. Power of 2. */ int f_code_size; @@ -186,3 +197,6 @@ typedef struct file_node { #define HISTORY_SIZE(n) stifle_history(n) #define UNLIMIT_HISTORY unstifle_history() #endif + +/* Now the global variable declarations. */ +#include "global.h" |