From b788cdfc8eeb9f9bc3b573f4e9b15cd03a57391d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Sat, 4 Jul 1998 19:08:53 +0200 Subject: [PATCH] Moved include of global.h first. Rev: src/modules/MIME/mime.c:1.12 Rev: src/modules/Msql/msqlmod.c:1.8 Rev: src/modules/Mysql/mysql.c:1.23 Rev: src/modules/Mysql/result.c:1.12 Rev: src/modules/Odbc/odbc.c:1.10 Rev: src/modules/Odbc/odbc_result.c:1.14 Rev: src/modules/Oracle/oracle.c:1.14 Rev: src/modules/Postgres/pgresult.c:1.7 Rev: src/modules/Postgres/postgres.c:1.7 Rev: src/modules/Regexp/glue.c:1.12 Rev: src/modules/Ssleay/ssleay.c:1.9 Rev: src/modules/_Image_JPEG/image_jpeg.c:1.19 Rev: src/modules/math/math.c:1.12 Rev: src/modules/system/passwords.c:1.15 Rev: src/modules/system/syslog.c:1.6 Rev: src/modules/system/system.c:1.56 Rev: src/opcodes.c:1.29 Rev: src/operators.c:1.37 --- src/modules/MIME/mime.c | 7 ++++--- src/modules/Msql/msqlmod.c | 6 +++--- src/modules/Mysql/mysql.c | 10 ++++++---- src/modules/Mysql/result.c | 8 +++++--- src/modules/Odbc/odbc.c | 7 ++++--- src/modules/Odbc/odbc_result.c | 7 ++++--- src/modules/Oracle/oracle.c | 7 ++++--- src/modules/Postgres/pgresult.c | 6 +++--- src/modules/Postgres/postgres.c | 4 ++-- src/modules/Regexp/glue.c | 5 +++-- src/modules/Ssleay/ssleay.c | 5 +++-- src/modules/_Image_JPEG/image_jpeg.c | 7 ++++--- src/modules/math/math.c | 4 ++-- src/modules/system/passwords.c | 8 ++++---- src/modules/system/syslog.c | 8 ++++---- src/modules/system/system.c | 7 ++++--- src/opcodes.c | 4 ++-- src/operators.c | 4 ++-- 18 files changed, 63 insertions(+), 51 deletions(-) diff --git a/src/modules/MIME/mime.c b/src/modules/MIME/mime.c index f3e0afcb7a..032cbb6c74 100644 --- a/src/modules/MIME/mime.c +++ b/src/modules/MIME/mime.c @@ -1,15 +1,16 @@ /* - * $Id: mime.c,v 1.11 1998/04/04 01:15:40 mirar Exp $ + * $Id: mime.c,v 1.12 1998/07/04 16:57:33 grubba Exp $ * * RFC1521 functionality for Pike * * Marcus Comstedt 1996-1997 */ +#include "global.h" + #include "config.h" -#include "global.h" -RCSID("$Id: mime.c,v 1.11 1998/04/04 01:15:40 mirar Exp $"); +RCSID("$Id: mime.c,v 1.12 1998/07/04 16:57:33 grubba Exp $"); #include "stralloc.h" #include "pike_macros.h" #include "object.h" diff --git a/src/modules/Msql/msqlmod.c b/src/modules/Msql/msqlmod.c index 4876f05b53..cce0d7d6a5 100644 --- a/src/modules/Msql/msqlmod.c +++ b/src/modules/Msql/msqlmod.c @@ -2,13 +2,14 @@ * This code is (C) Francesco Chemolli, 1997. * You may use, modify and redistribute it freely under the terms * of the GNU General Public License, version 2. - * $Id: msqlmod.c,v 1.7 1998/03/03 14:17:55 grubba Exp $ + * $Id: msqlmod.c,v 1.8 1998/07/04 16:58:06 grubba Exp $ * * This version is intended for Pike/0.5 and later. * It won't compile under older versions of the Pike interpreter. */ /* All this code is pretty useless if we don't have a msql library...*/ +#include "global.h" #include "msql_config.h" #ifdef HAVE_MSQL @@ -21,7 +22,6 @@ #include <string.h> #include <stdlib.h> -#include "global.h" #include "threads.h" #include "machine.h" #include "interpret.h" @@ -35,7 +35,7 @@ #include "operators.h" #include "multiset.h" -RCSID("$Id: msqlmod.c,v 1.7 1998/03/03 14:17:55 grubba Exp $"); +RCSID("$Id: msqlmod.c,v 1.8 1998/07/04 16:58:06 grubba Exp $"); #include "version.h" #ifdef _REENTRANT diff --git a/src/modules/Mysql/mysql.c b/src/modules/Mysql/mysql.c index 4fb5ff611a..2f5dac02ed 100644 --- a/src/modules/Mysql/mysql.c +++ b/src/modules/Mysql/mysql.c @@ -1,11 +1,14 @@ /* - * $Id: mysql.c,v 1.22 1998/07/02 16:30:03 grubba Exp $ + * $Id: mysql.c,v 1.23 1998/07/04 16:59:32 grubba Exp $ * * SQL database functionality for Pike * * Henrik Grubbström 1996-12-21 */ +/* Master Pike headerfile */ +#include "global.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ @@ -44,7 +47,6 @@ typedef struct dynamic_buffer_s dynamic_buffer; #endif /* HAVE_MYSQL */ /* From the Pike-dist */ -#include "global.h" #include "svalue.h" #include "object.h" #include "stralloc.h" @@ -73,7 +75,7 @@ typedef struct dynamic_buffer_s dynamic_buffer; * Globals */ -RCSID("$Id: mysql.c,v 1.22 1998/07/02 16:30:03 grubba Exp $"); +RCSID("$Id: mysql.c,v 1.23 1998/07/04 16:59:32 grubba Exp $"); /* **! module Mysql @@ -85,7 +87,7 @@ RCSID("$Id: mysql.c,v 1.22 1998/07/02 16:30:03 grubba Exp $"); **! see also: Mysql.mysql, Mysql.result, Sql.sql **! **! note -**! $Id: mysql.c,v 1.22 1998/07/02 16:30:03 grubba Exp $ +**! $Id: mysql.c,v 1.23 1998/07/04 16:59:32 grubba Exp $ **! class mysql **! **! Mysql.mysql is a pre-compiled Pike program. It enables diff --git a/src/modules/Mysql/result.c b/src/modules/Mysql/result.c index 357a7bc1a8..337061e3a6 100644 --- a/src/modules/Mysql/result.c +++ b/src/modules/Mysql/result.c @@ -1,11 +1,14 @@ /* - * $Id: result.c,v 1.11 1998/04/20 18:53:41 grubba Exp $ + * $Id: result.c,v 1.12 1998/07/04 16:58:51 grubba Exp $ * * mysql query result * * Henrik Grubbström 1996-12-21 */ +/* Pike master headerfile */ +#include "global.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ @@ -41,7 +44,6 @@ typedef struct dynamic_buffer_s dynamic_buffer; /* From the Pike-dist */ -#include "global.h" #include "svalue.h" #include "mapping.h" #include "object.h" @@ -78,7 +80,7 @@ typedef struct dynamic_buffer_s dynamic_buffer; * Globals */ -RCSID("$Id: result.c,v 1.11 1998/04/20 18:53:41 grubba Exp $"); +RCSID("$Id: result.c,v 1.12 1998/07/04 16:58:51 grubba Exp $"); struct program *mysql_result_program = NULL; diff --git a/src/modules/Odbc/odbc.c b/src/modules/Odbc/odbc.c index 5e74d85253..c149b8e59e 100644 --- a/src/modules/Odbc/odbc.c +++ b/src/modules/Odbc/odbc.c @@ -1,5 +1,5 @@ /* - * $Id: odbc.c,v 1.9 1998/05/31 15:40:31 grubba Exp $ + * $Id: odbc.c,v 1.10 1998/07/04 17:00:01 grubba Exp $ * * Pike interface to ODBC compliant databases. * @@ -10,12 +10,13 @@ * Includes */ +#include "global.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ -#include "global.h" -RCSID("$Id: odbc.c,v 1.9 1998/05/31 15:40:31 grubba Exp $"); +RCSID("$Id: odbc.c,v 1.10 1998/07/04 17:00:01 grubba Exp $"); #include "interpret.h" #include "object.h" diff --git a/src/modules/Odbc/odbc_result.c b/src/modules/Odbc/odbc_result.c index b38a861670..b45dc051b1 100644 --- a/src/modules/Odbc/odbc_result.c +++ b/src/modules/Odbc/odbc_result.c @@ -1,5 +1,5 @@ /* - * $Id: odbc_result.c,v 1.13 1998/06/04 11:45:09 grubba Exp $ + * $Id: odbc_result.c,v 1.14 1998/07/04 17:08:25 grubba Exp $ * * Pike interface to ODBC compliant databases * @@ -10,14 +10,15 @@ * Includes */ +#include "global.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ #ifdef HAVE_ODBC -#include "global.h" -RCSID("$Id: odbc_result.c,v 1.13 1998/06/04 11:45:09 grubba Exp $"); +RCSID("$Id: odbc_result.c,v 1.14 1998/07/04 17:08:25 grubba Exp $"); #include "interpret.h" #include "object.h" diff --git a/src/modules/Oracle/oracle.c b/src/modules/Oracle/oracle.c index e63c181246..9503d7fca7 100644 --- a/src/modules/Oracle/oracle.c +++ b/src/modules/Oracle/oracle.c @@ -1,5 +1,5 @@ /* - * $Id: oracle.c,v 1.13 1998/05/18 15:15:02 marcus Exp $ + * $Id: oracle.c,v 1.14 1998/07/04 17:00:25 grubba Exp $ * * Pike interface to Oracle databases. * @@ -10,11 +10,12 @@ * Includes */ +#include "global.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ -#include "global.h" #include "svalue.h" #include "object.h" #include "array.h" @@ -35,7 +36,7 @@ #endif -RCSID("$Id: oracle.c,v 1.13 1998/05/18 15:15:02 marcus Exp $"); +RCSID("$Id: oracle.c,v 1.14 1998/07/04 17:00:25 grubba Exp $"); #ifdef HAVE_ORACLE diff --git a/src/modules/Postgres/pgresult.c b/src/modules/Postgres/pgresult.c index 698a2817b2..eccd2ee78e 100644 --- a/src/modules/Postgres/pgresult.c +++ b/src/modules/Postgres/pgresult.c @@ -1,5 +1,5 @@ /* - * $Id: pgresult.c,v 1.6 1998/04/20 18:53:48 grubba Exp $ + * $Id: pgresult.c,v 1.7 1998/07/04 17:01:02 grubba Exp $ * * Postgres95 support for pike/0.5 and up * @@ -33,6 +33,7 @@ * moving the check inside the actual sql classes. */ +#include "global.h" #include "pgres_config.h" #ifdef HAVE_POSTGRES @@ -54,7 +55,6 @@ #include <libpq-fe.h> /* Pike includes */ -#include "global.h" #include "stralloc.h" #include "object.h" #include "threads.h" @@ -63,7 +63,7 @@ #include "builtin_functions.h" #include "module_support.h" -RCSID("$Id: pgresult.c,v 1.6 1998/04/20 18:53:48 grubba Exp $"); +RCSID("$Id: pgresult.c,v 1.7 1998/07/04 17:01:02 grubba Exp $"); #ifdef _REENTRANT MUTEX_T pike_postgres_result_mutex; diff --git a/src/modules/Postgres/postgres.c b/src/modules/Postgres/postgres.c index c2e4ee098c..76118d2092 100644 --- a/src/modules/Postgres/postgres.c +++ b/src/modules/Postgres/postgres.c @@ -7,6 +7,7 @@ * of the GNU General Public License, version 2. */ +#include "global.h" #include "pgres_config.h" #ifdef HAVE_POSTGRES @@ -20,7 +21,6 @@ #include <string.h> /* Pike includes */ -#include "global.h" #include "las.h" #include "machine.h" #include "pike_memory.h" @@ -62,7 +62,7 @@ static void pgdebug (char * a, ...) {} struct program * postgres_program; -RCSID("$Id: postgres.c,v 1.6 1998/04/20 18:53:49 grubba Exp $"); +RCSID("$Id: postgres.c,v 1.7 1998/07/04 17:01:31 grubba Exp $"); #define THIS ((struct pgres_object_data *) fp->current_storage) diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c index 82f1fbc35f..567c0d6f10 100644 --- a/src/modules/Regexp/glue.c +++ b/src/modules/Regexp/glue.c @@ -4,11 +4,12 @@ ||| See the files COPYING and DISCLAIMER for more information. \*/ +#include "global.h" + #ifdef HAVE_CONFIG_H #include "config.h" #endif /* HAVE_CONFIG_H */ -#include "global.h" #include "interpret.h" #include "svalue.h" #include "stralloc.h" @@ -18,7 +19,7 @@ #include "threads.h" #include "module_support.h" -RCSID("$Id: glue.c,v 1.11 1998/04/20 18:53:50 grubba Exp $"); +RCSID("$Id: glue.c,v 1.12 1998/07/04 17:02:00 grubba Exp $"); #ifdef USE_SYSTEM_REGEXP #include <regexp.h> diff --git a/src/modules/Ssleay/ssleay.c b/src/modules/Ssleay/ssleay.c index 65f19ff203..60bbcabd9f 100644 --- a/src/modules/Ssleay/ssleay.c +++ b/src/modules/Ssleay/ssleay.c @@ -4,10 +4,11 @@ ||| See the files COPYING and DISCLAIMER for more information. \*/ +#include "global.h" + #include "config.h" -#include "global.h" -RCSID("$Id: ssleay.c,v 1.8 1998/04/20 18:53:51 grubba Exp $"); +RCSID("$Id: ssleay.c,v 1.9 1998/07/04 17:02:27 grubba Exp $"); #include "interpret.h" #include "svalue.h" #include "stralloc.h" diff --git a/src/modules/_Image_JPEG/image_jpeg.c b/src/modules/_Image_JPEG/image_jpeg.c index 39d9df569c..956d449f53 100644 --- a/src/modules/_Image_JPEG/image_jpeg.c +++ b/src/modules/_Image_JPEG/image_jpeg.c @@ -1,7 +1,9 @@ /* - * $Id: image_jpeg.c,v 1.18 1998/06/19 12:55:24 mirar Exp $ + * $Id: image_jpeg.c,v 1.19 1998/07/04 17:06:52 grubba Exp $ */ +#include "global.h" + #include "config.h" #if !defined(HAVE_LIBJPEG) @@ -21,8 +23,7 @@ #ifdef HAVE_STDLIB_H #undef HAVE_STDLIB_H #endif -#include "global.h" -RCSID("$Id: image_jpeg.c,v 1.18 1998/06/19 12:55:24 mirar Exp $"); +RCSID("$Id: image_jpeg.c,v 1.19 1998/07/04 17:06:52 grubba Exp $"); #include "pike_macros.h" #include "object.h" diff --git a/src/modules/math/math.c b/src/modules/math/math.c index 09303879d1..1c3875ca11 100644 --- a/src/modules/math/math.c +++ b/src/modules/math/math.c @@ -3,8 +3,8 @@ ||| Pike is distributed as GPL (General Public License) ||| See the files COPYING and DISCLAIMER for more information. \*/ -#include <math.h> #include "global.h" +#include <math.h> #include "interpret.h" #include "constants.h" #include "svalue.h" @@ -12,7 +12,7 @@ #include "module_support.h" #include "operators.h" -RCSID("$Id: math.c,v 1.11 1998/06/07 21:20:15 grubba Exp $"); +RCSID("$Id: math.c,v 1.12 1998/07/04 17:02:55 grubba Exp $"); #ifndef M_PI #define M_PI 3.1415926535897932384626433832795080 diff --git a/src/modules/system/passwords.c b/src/modules/system/passwords.c index cb8393b5dc..1b5df9a037 100644 --- a/src/modules/system/passwords.c +++ b/src/modules/system/passwords.c @@ -1,5 +1,5 @@ /* - * $Id: passwords.c,v 1.14 1998/05/22 12:34:28 grubba Exp $ + * $Id: passwords.c,v 1.15 1998/07/04 17:08:53 grubba Exp $ * * Password handling for Pike. * @@ -17,12 +17,12 @@ /* * Includes */ +#include "global.h" + #include "system_machine.h" #include "system.h" -#include "global.h" - -RCSID("$Id: passwords.c,v 1.14 1998/05/22 12:34:28 grubba Exp $"); +RCSID("$Id: passwords.c,v 1.15 1998/07/04 17:08:53 grubba Exp $"); #include "module_support.h" #include "interpret.h" diff --git a/src/modules/system/syslog.c b/src/modules/system/syslog.c index 972e24937b..94fe963377 100644 --- a/src/modules/system/syslog.c +++ b/src/modules/system/syslog.c @@ -1,5 +1,5 @@ /* - * $Id: syslog.c,v 1.5 1998/03/26 14:31:02 grubba Exp $ + * $Id: syslog.c,v 1.6 1998/07/04 17:05:53 grubba Exp $ * * Access to syslog from Pike. * @@ -10,14 +10,14 @@ * Includes */ +#include "global.h" + #include "system_machine.h" #include "system.h" -#include "global.h" - #ifdef HAVE_SYSLOG -RCSID("$Id: syslog.c,v 1.5 1998/03/26 14:31:02 grubba Exp $"); +RCSID("$Id: syslog.c,v 1.6 1998/07/04 17:05:53 grubba Exp $"); #include "interpret.h" #include "svalue.h" diff --git a/src/modules/system/system.c b/src/modules/system/system.c index 4ff52aa429..1fb3e810cb 100644 --- a/src/modules/system/system.c +++ b/src/modules/system/system.c @@ -1,5 +1,5 @@ /* - * $Id: system.c,v 1.55 1998/06/24 07:43:30 hubbe Exp $ + * $Id: system.c,v 1.56 1998/07/04 17:06:19 grubba Exp $ * * System-call module for Pike * @@ -10,11 +10,12 @@ * Includes */ +#include "global.h" + #include "system_machine.h" #include "system.h" -#include "global.h" -RCSID("$Id: system.c,v 1.55 1998/06/24 07:43:30 hubbe Exp $"); +RCSID("$Id: system.c,v 1.56 1998/07/04 17:06:19 grubba Exp $"); #ifdef HAVE_WINSOCK_H #include <winsock.h> #endif diff --git a/src/opcodes.c b/src/opcodes.c index 623bf21372..b847a8e7be 100644 --- a/src/opcodes.c +++ b/src/opcodes.c @@ -3,9 +3,9 @@ ||| Pike is distributed as GPL (General Public License) ||| See the files COPYING and DISCLAIMER for more information. \*/ +#include "global.h" #include <math.h> #include <ctype.h> -#include "global.h" #include "interpret.h" #include "svalue.h" #include "array.h" @@ -22,7 +22,7 @@ #include "builtin_functions.h" #include "module_support.h" -RCSID("$Id: opcodes.c,v 1.28 1998/06/07 19:47:53 grubba Exp $"); +RCSID("$Id: opcodes.c,v 1.29 1998/07/04 16:56:14 grubba Exp $"); void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind) { diff --git a/src/operators.c b/src/operators.c index f8465b1517..8632195aec 100644 --- a/src/operators.c +++ b/src/operators.c @@ -3,9 +3,9 @@ ||| Pike is distributed as GPL (General Public License) ||| See the files COPYING and DISCLAIMER for more information. \*/ -#include <math.h> #include "global.h" -RCSID("$Id: operators.c,v 1.36 1998/06/06 13:05:03 grubba Exp $"); +#include <math.h> +RCSID("$Id: operators.c,v 1.37 1998/07/04 16:56:42 grubba Exp $"); #include "interpret.h" #include "svalue.h" #include "multiset.h" -- GitLab