From 531c1724731f77247b8b6b2dc9cdf9ea1548f306 Mon Sep 17 00:00:00 2001 From: Martin Nilsson <mani@lysator.liu.se> Date: Sat, 11 May 2002 02:29:41 +0200 Subject: [PATCH] Added #define sp Pike_sp and #define fp Pike_fp Rev: src/modules/Gmp/mpf.cmod:1.5 Rev: src/modules/Gmp/mpq.cmod:1.6 Rev: src/modules/Gmp/mpz_glue.c:1.104 Rev: src/modules/Image/encodings/xcf.c:1.39 Rev: src/modules/Image/image_module.c:1.13 Rev: src/modules/Mird/mird_glue.c:1.17 Rev: src/modules/Odbc/odbc.c:1.29 Rev: src/modules/PDF/pdf_module.c:1.10 Rev: src/modules/Parser/parser.c:1.13 Rev: src/modules/Ssleay/ssleay.c:1.16 Rev: src/modules/_Charset/charsetmod.c:1.33 Rev: src/modules/_Charset/iso2022.c:1.22 Rev: src/modules/_Image_FreeType/freetype.c:1.6 Rev: src/signal_handler.c:1.223 --- src/modules/Gmp/mpf.cmod | 5 ++++- src/modules/Gmp/mpq.cmod | 5 ++++- src/modules/Gmp/mpz_glue.c | 5 ++++- src/modules/Image/encodings/xcf.c | 4 +++- src/modules/Image/image_module.c | 4 +++- src/modules/Mird/mird_glue.c | 3 +++ src/modules/Odbc/odbc.c | 7 +++++-- src/modules/PDF/pdf_module.c | 4 +++- src/modules/Parser/parser.c | 5 ++++- src/modules/Ssleay/ssleay.c | 5 ++++- src/modules/_Charset/charsetmod.c | 5 ++++- src/modules/_Charset/iso2022.c | 5 ++++- src/modules/_Image_FreeType/freetype.c | 5 ++++- src/signal_handler.c | 7 ++++--- 14 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/modules/Gmp/mpf.cmod b/src/modules/Gmp/mpf.cmod index 41bf007156..60d427e628 100644 --- a/src/modules/Gmp/mpf.cmod +++ b/src/modules/Gmp/mpf.cmod @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: mpf.cmod,v 1.4 2002/04/25 08:55:05 grubba Exp $"); +RCSID("$Id: mpf.cmod,v 1.5 2002/05/11 00:13:10 nilsson Exp $"); #include "gmp_machine.h" #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2) @@ -43,6 +43,9 @@ RCSID("$Id: mpf.cmod,v 1.4 2002/04/25 08:55:05 grubba Exp $"); /* This must be included last! */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #define THISMPF (&(THIS->n)) #ifndef CHAR_BITS diff --git a/src/modules/Gmp/mpq.cmod b/src/modules/Gmp/mpq.cmod index 5288fa99be..273660a9c6 100644 --- a/src/modules/Gmp/mpq.cmod +++ b/src/modules/Gmp/mpq.cmod @@ -4,7 +4,7 @@ ||| See the files COPYING and DISCLAIMER for more information. \*/ #include "global.h" -RCSID("$Id: mpq.cmod,v 1.5 2002/04/25 08:55:06 grubba Exp $"); +RCSID("$Id: mpq.cmod,v 1.6 2002/05/11 00:13:10 nilsson Exp $"); #include "gmp_machine.h" #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2) @@ -42,6 +42,9 @@ RCSID("$Id: mpq.cmod,v 1.5 2002/04/25 08:55:06 grubba Exp $"); /* This must be included last! */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #define THISMPQ (&(THIS->n)) #define PUSH_REDUCED(o) push_object(o) diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c index 330a7f5317..8d809a886a 100644 --- a/src/modules/Gmp/mpz_glue.c +++ b/src/modules/Gmp/mpz_glue.c @@ -5,7 +5,7 @@ \*/ /**/ #include "global.h" -RCSID("$Id: mpz_glue.c,v 1.103 2002/04/25 08:47:40 grubba Exp $"); +RCSID("$Id: mpz_glue.c,v 1.104 2002/05/11 00:13:10 nilsson Exp $"); #include "gmp_machine.h" #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2) @@ -41,6 +41,9 @@ RCSID("$Id: mpz_glue.c,v 1.103 2002/04/25 08:47:40 grubba Exp $"); /* This must be included last! */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #ifdef _MSC_VER /* No random()... provide one for gmp * This should possibly be a configure test diff --git a/src/modules/Image/encodings/xcf.c b/src/modules/Image/encodings/xcf.c index 82f233d109..15d053cca3 100644 --- a/src/modules/Image/encodings/xcf.c +++ b/src/modules/Image/encodings/xcf.c @@ -1,5 +1,5 @@ #include "global.h" -RCSID("$Id: xcf.c,v 1.38 2001/06/13 13:00:21 grubba Exp $"); +RCSID("$Id: xcf.c,v 1.39 2002/05/11 00:11:38 nilsson Exp $"); #include "image_machine.h" @@ -29,6 +29,8 @@ RCSID("$Id: xcf.c,v 1.38 2001/06/13 13:00:21 grubba Exp $"); /* MUST BE INCLUDED LAST */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp extern struct program *image_colortable_program; extern struct program *image_program; diff --git a/src/modules/Image/image_module.c b/src/modules/Image/image_module.c index 1f401744b7..7f273d2018 100644 --- a/src/modules/Image/image_module.c +++ b/src/modules/Image/image_module.c @@ -1,7 +1,7 @@ #include "global.h" #include "stralloc.h" #include "global.h" -RCSID("$Id: image_module.c,v 1.12 2001/09/24 11:11:57 grubba Exp $"); +RCSID("$Id: image_module.c,v 1.13 2002/05/11 00:24:25 nilsson Exp $"); #include "pike_macros.h" #include "interpret.h" #include "program.h" @@ -16,6 +16,8 @@ RCSID("$Id: image_module.c,v 1.12 2001/09/24 11:11:57 grubba Exp $"); /* This must be included last! */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp #define IMAGE_INITER diff --git a/src/modules/Mird/mird_glue.c b/src/modules/Mird/mird_glue.c index 58a26d1a79..94d58d5dae 100644 --- a/src/modules/Mird/mird_glue.c +++ b/src/modules/Mird/mird_glue.c @@ -20,6 +20,9 @@ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #ifdef HAVE_MIRD #include <mird.h> diff --git a/src/modules/Odbc/odbc.c b/src/modules/Odbc/odbc.c index c3d034fc15..61ccf24155 100644 --- a/src/modules/Odbc/odbc.c +++ b/src/modules/Odbc/odbc.c @@ -1,5 +1,5 @@ /* - * $Id: odbc.c,v 1.28 2001/10/03 15:35:20 grubba Exp $ + * $Id: odbc.c,v 1.29 2002/05/11 00:24:25 nilsson Exp $ * * Pike interface to ODBC compliant databases. * @@ -16,7 +16,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -RCSID("$Id: odbc.c,v 1.28 2001/10/03 15:35:20 grubba Exp $"); +RCSID("$Id: odbc.c,v 1.29 2002/05/11 00:24:25 nilsson Exp $"); #include "interpret.h" #include "object.h" @@ -36,6 +36,9 @@ RCSID("$Id: odbc.c,v 1.28 2001/10/03 15:35:20 grubba Exp $"); /* must be included last */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #ifdef HAVE_ODBC /* diff --git a/src/modules/PDF/pdf_module.c b/src/modules/PDF/pdf_module.c index 0a0e77b68c..50fcb21688 100644 --- a/src/modules/PDF/pdf_module.c +++ b/src/modules/PDF/pdf_module.c @@ -1,7 +1,7 @@ #include "global.h" #include "stralloc.h" #include "global.h" -RCSID("$Id: pdf_module.c,v 1.9 2001/07/12 14:01:45 grubba Exp $"); +RCSID("$Id: pdf_module.c,v 1.10 2002/05/11 00:24:25 nilsson Exp $"); #include "pike_macros.h" #include "interpret.h" #include "program.h" @@ -13,6 +13,8 @@ RCSID("$Id: pdf_module.c,v 1.9 2001/07/12 14:01:45 grubba Exp $"); /* This must be included last! */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp #define PDF_INITER diff --git a/src/modules/Parser/parser.c b/src/modules/Parser/parser.c index b98cad864b..3ebb7eb2c1 100644 --- a/src/modules/Parser/parser.c +++ b/src/modules/Parser/parser.c @@ -1,7 +1,7 @@ #include "global.h" #include "stralloc.h" #include "global.h" -RCSID("$Id: parser.c,v 1.12 2001/07/12 14:02:16 grubba Exp $"); +RCSID("$Id: parser.c,v 1.13 2002/05/11 00:24:25 nilsson Exp $"); #include "pike_macros.h" #include "interpret.h" #include "program.h" @@ -14,6 +14,9 @@ RCSID("$Id: parser.c,v 1.12 2001/07/12 14:02:16 grubba Exp $"); /* must be included last */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #define PARSER_INITER /*#define DEBUG*/ diff --git a/src/modules/Ssleay/ssleay.c b/src/modules/Ssleay/ssleay.c index c638505405..1e5544b9df 100644 --- a/src/modules/Ssleay/ssleay.c +++ b/src/modules/Ssleay/ssleay.c @@ -8,7 +8,7 @@ #include "config.h" -RCSID("$Id: ssleay.c,v 1.15 2002/01/16 03:02:34 nilsson Exp $"); +RCSID("$Id: ssleay.c,v 1.16 2002/05/11 00:24:25 nilsson Exp $"); #include "interpret.h" #include "svalue.h" #include "stralloc.h" @@ -36,6 +36,9 @@ RCSID("$Id: ssleay.c,v 1.15 2002/01/16 03:02:34 nilsson Exp $"); #include <err.h> #include <x509.h> +#define sp Pike_sp +#define fp Pike_fp + /* SSLeay defines _ as a macro. That's Puckat(TM). */ #undef _ diff --git a/src/modules/_Charset/charsetmod.c b/src/modules/_Charset/charsetmod.c index a700b75f12..a4a128b474 100644 --- a/src/modules/_Charset/charsetmod.c +++ b/src/modules/_Charset/charsetmod.c @@ -3,7 +3,7 @@ #endif /* HAVE_CONFIG_H */ #include "../../global.h" -RCSID("$Id: charsetmod.c,v 1.32 2001/10/07 19:29:13 marcus Exp $"); +RCSID("$Id: charsetmod.c,v 1.33 2002/05/11 00:24:25 nilsson Exp $"); #include "program.h" #include "interpret.h" #include "stralloc.h" @@ -16,6 +16,9 @@ RCSID("$Id: charsetmod.c,v 1.32 2001/10/07 19:29:13 marcus Exp $"); /* MUST BE LAST INCLUDE */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #ifdef __CHAR_UNSIGNED__ #define SIGNED signed #else diff --git a/src/modules/_Charset/iso2022.c b/src/modules/_Charset/iso2022.c index 74035188ba..eab8f321d9 100644 --- a/src/modules/_Charset/iso2022.c +++ b/src/modules/_Charset/iso2022.c @@ -3,7 +3,7 @@ #endif /* HAVE_CONFIG_H */ #include "global.h" -RCSID("$Id: iso2022.c,v 1.21 2001/06/19 22:48:36 per Exp $"); +RCSID("$Id: iso2022.c,v 1.22 2002/05/11 00:24:26 nilsson Exp $"); #include "program.h" #include "interpret.h" #include "stralloc.h" @@ -16,6 +16,9 @@ RCSID("$Id: iso2022.c,v 1.21 2001/06/19 22:48:36 per Exp $"); /* MUST BE LAST INCLUDE */ #include "module_magic.h" +#define sp Pike_sp +#define fp Pike_fp + #define PRGM_NAME "Locale.Charset.ISO2022" diff --git a/src/modules/_Image_FreeType/freetype.c b/src/modules/_Image_FreeType/freetype.c index 75e344748e..accc58bac9 100644 --- a/src/modules/_Image_FreeType/freetype.c +++ b/src/modules/_Image_FreeType/freetype.c @@ -1,6 +1,6 @@ #include "config.h" #include "global.h" -RCSID("$Id: freetype.c,v 1.5 2001/12/21 23:37:20 nilsson Exp $"); +RCSID("$Id: freetype.c,v 1.6 2002/05/11 00:24:25 nilsson Exp $"); #ifdef HAVE_LIBFT2 #include <freetype/freetype.h> @@ -19,6 +19,9 @@ RCSID("$Id: freetype.c,v 1.5 2001/12/21 23:37:20 nilsson Exp $"); #include "operators.h" #include "../Image/image.h" +#define sp Pike_sp +#define fp Pike_fp + static FT_Library library; static struct program *face_program; #ifdef DYNAMIC_MODULE diff --git a/src/signal_handler.c b/src/signal_handler.c index 50c707a97d..b99c11a3dd 100644 --- a/src/signal_handler.c +++ b/src/signal_handler.c @@ -25,7 +25,7 @@ #include "main.h" #include <signal.h> -RCSID("$Id: signal_handler.c,v 1.222 2002/05/10 22:20:21 mast Exp $"); +RCSID("$Id: signal_handler.c,v 1.223 2002/05/11 00:29:41 nilsson Exp $"); #ifdef HAVE_PASSWD_H # include <passwd.h> @@ -99,6 +99,9 @@ RCSID("$Id: signal_handler.c,v 1.222 2002/05/10 22:20:21 mast Exp $"); #undef timeval #endif +#define sp Pike_sp +#define fp Pike_fp + #ifdef NSIG #define MAX_SIGNALS NSIG @@ -4029,5 +4032,3 @@ void exit_signals(void) signal_callbacks[e].type=T_INT; } } - - -- GitLab