From bb55f8be46f036b608cb1c3c03868fe5fd3180da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sun, 16 Mar 1997 19:21:01 -0800
Subject: [PATCH] macros.h renamed to pike_macros.h

Rev: src/ChangeLog:1.89
Rev: src/builtin_functions.c:1.34
Rev: src/callback.c:1.7
Rev: src/configure.in:1.62
Rev: src/constants.c:1.9
Rev: src/docode.c:1.15
Rev: src/dynamic_load.c:1.13
Rev: src/encode.c:1.5
Rev: src/error.c:1.6
Rev: src/interpret.c:1.37
Rev: src/language.yacc:1.33
Rev: src/las.c:1.30
Rev: src/lex.c:1.20
Rev: src/macros.h:1.5(DEAD)
Rev: src/main.c:1.19
Rev: src/mapping.c:1.16
Rev: src/memory.c:1.5
Rev: src/module.c:1.5
Rev: src/modules/Gdbm/gdbmmod.c:1.2
Rev: src/modules/Gmp/mpz_glue.c:1.8
Rev: src/modules/Gz/zlibmod.c:1.5
Rev: src/modules/Image/blit.c:1.2
Rev: src/modules/Image/dct.c:1.4
Rev: src/modules/Image/font.c:1.4
Rev: src/modules/Image/image.c:1.4
Rev: src/modules/Image/matrix.c:1.3
Rev: src/modules/Image/operator.c:1.3
Rev: src/modules/Image/pattern.c:1.3
Rev: src/modules/Image/pnm.c:1.2
Rev: src/modules/Image/togif.c:1.2
Rev: src/modules/MIME/mime.c:1.4
Rev: src/modules/Pipe/pipe.c:1.4
Rev: src/modules/Regexp/glue.c:1.4
Rev: src/modules/Ssleay/ssleay.c:1.4
Rev: src/modules/Yp/yp.c:1.5
Rev: src/modules/_Crypto/cbc.c:1.7
Rev: src/modules/_Crypto/crypto.c:1.18
Rev: src/modules/_Crypto/des.c:1.7
Rev: src/modules/_Crypto/invert.c:1.6
Rev: src/modules/_Crypto/md2.c:1.3
Rev: src/modules/_Crypto/pipe.c:1.7
Rev: src/modules/files/efuns.c:1.21
Rev: src/modules/files/file.c:1.31
Rev: src/modules/files/socket.c:1.8
Rev: src/modules/readline/readlinemod.c:1.2
Rev: src/modules/spider/accesseddb.c:1.6
Rev: src/modules/spider/discdate.c:1.3
Rev: src/modules/spider/dumudp.c:1.7
Rev: src/modules/spider/spider.c:1.26
Rev: src/modules/spider/stardate.c:1.3
Rev: src/modules/spider/streamed_parser.c:1.4
Rev: src/multiset.c:1.4
Rev: src/object.c:1.16
Rev: src/pike_macros.h:1.1
Rev: src/pike_types.c:1.20
Rev: src/port.c:1.7
Rev: src/program.c:1.28
Rev: src/signal_handler.c:1.9
Rev: src/stralloc.c:1.13
Rev: src/threads.c:1.20
---
 src/ChangeLog                        |  5 +++++
 src/builtin_functions.c              |  6 +++---
 src/callback.c                       |  2 +-
 src/configure.in                     | 14 ++++++++++++--
 src/constants.c                      |  2 +-
 src/docode.c                         |  4 ++--
 src/dynamic_load.c                   |  4 ++--
 src/encode.c                         |  2 +-
 src/error.c                          |  2 +-
 src/interpret.c                      |  4 ++--
 src/language.yacc                    |  4 ++--
 src/las.c                            |  4 ++--
 src/lex.c                            |  4 ++--
 src/main.c                           |  4 ++--
 src/mapping.c                        |  4 ++--
 src/memory.c                         |  2 +-
 src/module.c                         |  2 +-
 src/modules/Gdbm/gdbmmod.c           |  4 ++--
 src/modules/Gmp/mpz_glue.c           |  4 ++--
 src/modules/Gz/zlibmod.c             |  4 ++--
 src/modules/Image/blit.c             |  4 ++--
 src/modules/Image/dct.c              |  4 ++--
 src/modules/Image/font.c             |  4 ++--
 src/modules/Image/image.c            |  6 +++---
 src/modules/Image/matrix.c           |  4 ++--
 src/modules/Image/operator.c         |  4 ++--
 src/modules/Image/pattern.c          |  4 ++--
 src/modules/Image/pnm.c              |  4 ++--
 src/modules/Image/togif.c            |  4 ++--
 src/modules/MIME/mime.c              |  6 +++---
 src/modules/Pipe/pipe.c              |  4 ++--
 src/modules/Regexp/glue.c            |  2 +-
 src/modules/Ssleay/ssleay.c          |  4 ++--
 src/modules/Yp/yp.c                  |  2 +-
 src/modules/_Crypto/cbc.c            |  4 ++--
 src/modules/_Crypto/crypto.c         |  4 ++--
 src/modules/_Crypto/des.c            |  4 ++--
 src/modules/_Crypto/invert.c         |  4 ++--
 src/modules/_Crypto/md2.c            |  4 ++--
 src/modules/_Crypto/pipe.c           |  4 ++--
 src/modules/files/efuns.c            |  2 +-
 src/modules/files/file.c             |  4 ++--
 src/modules/files/socket.c           |  2 +-
 src/modules/readline/readlinemod.c   |  2 +-
 src/modules/spider/accesseddb.c      |  2 +-
 src/modules/spider/discdate.c        |  2 +-
 src/modules/spider/dumudp.c          |  4 ++--
 src/modules/spider/spider.c          |  2 +-
 src/modules/spider/stardate.c        |  2 +-
 src/modules/spider/streamed_parser.c |  2 +-
 src/multiset.c                       |  2 +-
 src/object.c                         |  4 ++--
 src/{macros.h => pike_macros.h}      |  0
 src/pike_types.c                     |  4 ++--
 src/port.c                           |  2 +-
 src/program.c                        |  4 ++--
 src/signal_handler.c                 |  2 +-
 src/stralloc.c                       |  4 ++--
 src/threads.c                        |  4 ++--
 59 files changed, 113 insertions(+), 98 deletions(-)
 rename src/{macros.h => pike_macros.h} (100%)

diff --git a/src/ChangeLog b/src/ChangeLog
index 35d4e3c644..6f963e4582 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 16 18:33:18 1997  Fredrik Hubinette  <hubbe@cytocin.hubbe.net>
+
+	* Getopt: fixed a major bug in get_all_options()
+	* macros.h renamed to pike_macros.h
+
 Thu Mar 13 17:06:09 1997  Fredrik Hubinette  <hubbe@cytocin.hubbe.net>
 
 	* changed check_args() and check_all_args(), they are much more
diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 9eb14c622e..0c749b8849 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -4,10 +4,10 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.33 1997/03/12 12:15:26 hubbe Exp $");
+RCSID("$Id: builtin_functions.c,v 1.34 1997/03/17 03:04:35 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "program.h"
 #include "array.h"
@@ -311,7 +311,7 @@ void f_backtrace(INT32 args)
 
       ITEM(a)[frames].u.array=i=allocate_array_no_init(3+args,0);
       ITEM(a)[frames].type=T_ARRAY;
-      assign_svalues_no_free(ITEM(i)+3, fp->locals, args, BIT_MIXED);
+      assign_svalues_no_free(ITEM(i)+3, f->locals, args, BIT_MIXED);
       ITEM(i)[2].type=T_FUNCTION;
       ITEM(i)[2].subtype=f->fun;
       ITEM(i)[2].u.object=f->current_object;
diff --git a/src/callback.c b/src/callback.c
index fe298f5472..4441271462 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -3,7 +3,7 @@
 ||| Pike is distributed as GPL (General Public License)
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
-#include "macros.h"
+#include "pike_macros.h"
 #include "callback.h"
 
 /*
diff --git a/src/configure.in b/src/configure.in
index 72a14549da..7ab3d90ff8 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.61 1997/03/12 12:05:48 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.62 1997/03/17 03:04:36 hubbe Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -1334,13 +1334,23 @@ AC_MSG_RESULT($CCSHARED)
 AC_MSG_CHECKING(LINKFORSHARED)
 if test -z "$LINKFORSHARED"
 then
+  if test "$GCC" = yes ; then
+    case $pike_cv_sys_os in
+	AIX*)	LINKFORSHARED="-Wl,-bE:pike.exp";;
+	hp*|HP*) LINKFORSHARED="-Wl,-E";;
+	Linux*) LINKFORSHARED="-rdynamic";;
+	next) LINKFORSHARED="-u libsys_s";;
+	SCO_SV*) LINKFORSHARED="-fpic -belf -dy";;
+    esac
+  else
     case $pike_cv_sys_os in
-	AIX*)	LINKFORSHARED="-Wl,-bE:python.exp";;
+	AIX*)	LINKFORSHARED="-Wl,-bE:pike.exp";;
 	hp*|HP*) LINKFORSHARED="-Wl,-E";;
 	Linux*) LINKFORSHARED="-rdynamic";;
 	next) LINKFORSHARED="-u libsys_s";;
 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
     esac
+  fi
 fi
 AC_MSG_RESULT($LINKFORSHARED)
 
diff --git a/src/constants.c b/src/constants.c
index a19c5171e4..ab35466346 100644
--- a/src/constants.c
+++ b/src/constants.c
@@ -5,7 +5,7 @@
 \*/
 #include "global.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "program.h"
 #include "pike_types.h"
 #include "stralloc.h"
diff --git a/src/docode.c b/src/docode.c
index 9cff5c5143..b2fd327118 100644
--- a/src/docode.c
+++ b/src/docode.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: docode.c,v 1.14 1997/03/11 03:36:39 hubbe Exp $");
+RCSID("$Id: docode.c,v 1.15 1997/03/17 03:04:37 hubbe Exp $");
 #include "las.h"
 #include "program.h"
 #include "language.h"
@@ -13,7 +13,7 @@ RCSID("$Id: docode.c,v 1.14 1997/03/11 03:36:39 hubbe Exp $");
 #include "interpret.h"
 #include "constants.h"
 #include "array.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "error.h"
 #include "memory.h"
 #include "svalue.h"
diff --git a/src/dynamic_load.c b/src/dynamic_load.c
index 7ce16e46be..6c701f4a06 100644
--- a/src/dynamic_load.c
+++ b/src/dynamic_load.c
@@ -16,7 +16,7 @@
 #include "error.h"
 #include "module.h"
 #include "stralloc.h"
-#include "macros.h"
+#include "pike_macros.h"
 
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
@@ -155,7 +155,7 @@ void exit_dynamic_load()
 #include "error.h"
 #include "module.h"
 #include "stralloc.h"
-#include "macros.h"
+#include "pike_macros.h"
 
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
diff --git a/src/encode.c b/src/encode.c
index 7dde4282ae..8f8834490d 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -6,7 +6,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/error.c b/src/error.c
index 72493f2b30..1e0c968a68 100644
--- a/src/error.c
+++ b/src/error.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "error.h"
 #include "interpret.h"
 #include "stralloc.h"
diff --git a/src/interpret.c b/src/interpret.c
index 276c946f1a..bda2abb481 100644
--- a/src/interpret.c
+++ b/src/interpret.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: interpret.c,v 1.36 1997/03/14 04:37:14 hubbe Exp $");
+RCSID("$Id: interpret.c,v 1.37 1997/03/17 03:04:38 hubbe Exp $");
 #include "interpret.h"
 #include "object.h"
 #include "program.h"
@@ -15,7 +15,7 @@ RCSID("$Id: interpret.c,v 1.36 1997/03/14 04:37:14 hubbe Exp $");
 #include "language.h"
 #include "stralloc.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "multiset.h"
 #include "backend.h"
 #include "operators.h"
diff --git a/src/language.yacc b/src/language.yacc
index 742996f403..539277363d 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -158,7 +158,7 @@
 /* This is the grammar definition of Pike. */
 
 #include "global.h"
-RCSID("$Id: language.yacc,v 1.32 1997/03/14 04:37:15 hubbe Exp $");
+RCSID("$Id: language.yacc,v 1.33 1997/03/17 03:04:39 hubbe Exp $");
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif
@@ -173,7 +173,7 @@ RCSID("$Id: language.yacc,v 1.32 1997/03/14 04:37:15 hubbe Exp $");
 #include "program.h"
 #include "pike_types.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "error.h"
 #include "docode.h"
 
diff --git a/src/las.c b/src/las.c
index 7e0b5d25fc..379aca4970 100644
--- a/src/las.c
+++ b/src/las.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: las.c,v 1.29 1997/03/05 05:22:55 hubbe Exp $");
+RCSID("$Id: las.c,v 1.30 1997/03/17 03:04:39 hubbe Exp $");
 
 #include "language.h"
 #include "interpret.h"
@@ -24,7 +24,7 @@ RCSID("$Id: las.c,v 1.29 1997/03/05 05:22:55 hubbe Exp $");
 #include "memory.h"
 #include "operators.h"
 #include "callback.h"
-#include "macros.h"
+#include "pike_macros.h"
 
 #define LASDEBUG
 
diff --git a/src/lex.c b/src/lex.c
index 6760ba7e70..de55d5a21c 100644
--- a/src/lex.c
+++ b/src/lex.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: lex.c,v 1.19 1997/03/14 04:37:16 hubbe Exp $");
+RCSID("$Id: lex.c,v 1.20 1997/03/17 03:04:40 hubbe Exp $");
 #include "language.h"
 #include "array.h"
 #include "lex.h"
@@ -23,7 +23,7 @@ RCSID("$Id: lex.c,v 1.19 1997/03/14 04:37:16 hubbe Exp $");
 #include "builtin_functions.h"
 #include "main.h"
 
-#include "macros.h"
+#include "pike_macros.h"
 #include <sys/param.h>
 #include <ctype.h>
 #include <math.h>
diff --git a/src/main.c b/src/main.c
index d652b32114..171412688f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: main.c,v 1.18 1997/02/07 01:08:18 hubbe Exp $");
+RCSID("$Id: main.c,v 1.19 1997/03/17 03:04:40 hubbe Exp $");
 #include "types.h"
 #include "backend.h"
 #include "module.h"
@@ -16,7 +16,7 @@ RCSID("$Id: main.c,v 1.18 1997/02/07 01:08:18 hubbe Exp $");
 #include "stralloc.h"
 #include "interpret.h"
 #include "error.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "callback.h"
 #include "signal_handler.h"
 #include "threads.h"
diff --git a/src/mapping.c b/src/mapping.c
index 5e234522dc..9040e10746 100644
--- a/src/mapping.c
+++ b/src/mapping.c
@@ -4,14 +4,14 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mapping.c,v 1.15 1997/03/14 04:37:16 hubbe Exp $");
+RCSID("$Id: mapping.c,v 1.16 1997/03/17 03:04:41 hubbe Exp $");
 #include "main.h"
 #include "types.h"
 #include "object.h"
 #include "mapping.h"
 #include "svalue.h"
 #include "array.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "language.h"
 #include "error.h"
 #include "memory.h"
diff --git a/src/memory.c b/src/memory.c
index a99396b29c..7cf99d0bda 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -6,7 +6,7 @@
 #include "global.h"
 #include "memory.h"
 #include "error.h"
-#include "macros.h"
+#include "pike_macros.h"
 
 char *xalloc(SIZE_T size)
 {
diff --git a/src/module.c b/src/module.c
index 9b7b673a71..4500a03fc8 100644
--- a/src/module.c
+++ b/src/module.c
@@ -5,7 +5,7 @@
 \*/
 #include "global.h"
 #include "module.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "error.h"
 #include "builtin_functions.h"
 #include "main.h"
diff --git a/src/modules/Gdbm/gdbmmod.c b/src/modules/Gdbm/gdbmmod.c
index ee01ec75c0..1f269fbb49 100644
--- a/src/modules/Gdbm/gdbmmod.c
+++ b/src/modules/Gdbm/gdbmmod.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: gdbmmod.c,v 1.1 1997/02/11 08:00:50 hubbe Exp $");
+RCSID("$Id: gdbmmod.c,v 1.2 1997/03/17 03:06:36 hubbe Exp $");
 #include "gdbm_machine.h"
 #include "types.h"
 #include "threads.h"
@@ -18,7 +18,7 @@ RCSID("$Id: gdbmmod.c,v 1.1 1997/02/11 08:00:50 hubbe Exp $");
 #include "stralloc.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 
 #include <gdbm.h>
 
diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c
index f2161aef48..1bd8c3923d 100644
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mpz_glue.c,v 1.7 1997/03/15 07:10:18 nisse Exp $");
+RCSID("$Id: mpz_glue.c,v 1.8 1997/03/17 03:06:58 hubbe Exp $");
 #include "gmp_machine.h"
 #include "types.h"
 
@@ -18,7 +18,7 @@ RCSID("$Id: mpz_glue.c,v 1.7 1997/03/15 07:10:18 nisse Exp $");
 #include "svalue.h"
 #include "stralloc.h"
 #include "array.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "program.h"
 #include "stralloc.h"
 #include "object.h"
diff --git a/src/modules/Gz/zlibmod.c b/src/modules/Gz/zlibmod.c
index 82374cddde..0158d59016 100644
--- a/src/modules/Gz/zlibmod.c
+++ b/src/modules/Gz/zlibmod.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: zlibmod.c,v 1.4 1997/02/27 09:14:21 hubbe Exp $");
+RCSID("$Id: zlibmod.c,v 1.5 1997/03/17 03:07:21 hubbe Exp $");
 
 #include "zlib_machine.h"
 #include "types.h"
@@ -19,7 +19,7 @@ RCSID("$Id: zlibmod.c,v 1.4 1997/02/27 09:14:21 hubbe Exp $");
 #include "svalue.h"
 #include "stralloc.h"
 #include "array.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "program.h"
 #include "stralloc.h"
 #include "object.h"
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 69b056dd31..fae36efccf 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,4 +1,4 @@
-/* $Id: blit.c,v 1.1 1997/02/11 08:35:41 hubbe Exp $ */
+/* $Id: blit.c,v 1.2 1997/03/17 03:07:59 hubbe Exp $ */
 #include "global.h"
 
 #include <math.h>
@@ -7,7 +7,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/dct.c b/src/modules/Image/dct.c
index 7c8f35628f..61c08611b2 100644
--- a/src/modules/Image/dct.c
+++ b/src/modules/Image/dct.c
@@ -1,4 +1,4 @@
-/* $Id: dct.c,v 1.3 1997/03/12 12:19:25 hubbe Exp $ */
+/* $Id: dct.c,v 1.4 1997/03/17 03:07:59 hubbe Exp $ */
 
 #include "global.h"
 
@@ -8,7 +8,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index d019c3e404..bdbc857173 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-/* $Id: font.c,v 1.3 1997/03/12 12:19:25 hubbe Exp $ */
+/* $Id: font.c,v 1.4 1997/03/17 03:08:00 hubbe Exp $ */
 
 #include "global.h"
 
@@ -22,7 +22,7 @@
 
 #include "stralloc.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index 2bf3057ebf..e4f49b343c 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.3 1997/03/12 12:19:26 hubbe Exp $ */
+/* $Id: image.c,v 1.4 1997/03/17 03:08:00 hubbe Exp $ */
 
 #include "global.h"
 
@@ -7,9 +7,9 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.3 1997/03/12 12:19:26 hubbe Exp $");
+RCSID("$Id: image.c,v 1.4 1997/03/17 03:08:00 hubbe Exp $");
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index e17819f339..ad1210527b 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,4 +1,4 @@
-/* $Id: matrix.c,v 1.2 1997/03/12 12:19:26 hubbe Exp $ */
+/* $Id: matrix.c,v 1.3 1997/03/17 03:08:01 hubbe Exp $ */
 
 #include "global.h"
 
@@ -8,7 +8,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index 57ea00083f..cb752958dc 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,4 +1,4 @@
-/* $Id: operator.c,v 1.2 1997/03/12 12:19:26 hubbe Exp $ */
+/* $Id: operator.c,v 1.3 1997/03/17 03:08:01 hubbe Exp $ */
 #include "global.h"
 
 #include <math.h>
@@ -7,7 +7,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/pattern.c b/src/modules/Image/pattern.c
index b7ce956c09..26c05921ce 100644
--- a/src/modules/Image/pattern.c
+++ b/src/modules/Image/pattern.c
@@ -1,4 +1,4 @@
-/* $Id: pattern.c,v 1.2 1997/03/12 12:19:27 hubbe Exp $ */
+/* $Id: pattern.c,v 1.3 1997/03/17 03:08:01 hubbe Exp $ */
 
 #include "global.h"
 
@@ -8,7 +8,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/pnm.c b/src/modules/Image/pnm.c
index 478047a8f6..6608512d3b 100644
--- a/src/modules/Image/pnm.c
+++ b/src/modules/Image/pnm.c
@@ -1,4 +1,4 @@
-/* $Id: pnm.c,v 1.1 1997/02/11 08:35:45 hubbe Exp $ */
+/* $Id: pnm.c,v 1.2 1997/03/17 03:08:02 hubbe Exp $ */
 
 #include "global.h"
 
@@ -8,7 +8,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Image/togif.c b/src/modules/Image/togif.c
index 7cde3f906c..4089510b7f 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -4,7 +4,7 @@ togif
 
 Pontus Hagland, law@infovav.se
 
-$Id: togif.c,v 1.1 1997/02/11 08:35:47 hubbe Exp $ 
+$Id: togif.c,v 1.2 1997/03/17 03:08:02 hubbe Exp $ 
 
 */
 
@@ -17,7 +17,7 @@ $Id: togif.c,v 1.1 1997/02/11 08:35:47 hubbe Exp $
 #include "global.h"
 #include "threads.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/MIME/mime.c b/src/modules/MIME/mime.c
index 3e20321398..97a9ff8849 100644
--- a/src/modules/MIME/mime.c
+++ b/src/modules/MIME/mime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mime.c,v 1.3 1997/03/13 02:54:38 marcus Exp $
+ * $Id: mime.c,v 1.4 1997/03/17 03:09:12 hubbe Exp $
  *
  * RFC1521 functionality for Pike
  *
@@ -9,10 +9,10 @@
 #include "config.h"
 
 #include "global.h"
-RCSID("$Id: mime.c,v 1.3 1997/03/13 02:54:38 marcus Exp $");
+RCSID("$Id: mime.c,v 1.4 1997/03/17 03:09:12 hubbe Exp $");
 #include "stralloc.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "program.h"
 #include "interpret.h"
diff --git a/src/modules/Pipe/pipe.c b/src/modules/Pipe/pipe.c
index 1e2799196b..2e4dac10a1 100644
--- a/src/modules/Pipe/pipe.c
+++ b/src/modules/Pipe/pipe.c
@@ -20,11 +20,11 @@
 #include <fcntl.h>
 
 #include "global.h"
-RCSID("$Id: pipe.c,v 1.3 1997/03/12 12:20:30 hubbe Exp $");
+RCSID("$Id: pipe.c,v 1.4 1997/03/17 03:09:45 hubbe Exp $");
 
 #include "stralloc.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index 1775386234..5f978356b9 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -15,7 +15,7 @@
 #include "stralloc.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 
 #ifdef USE_SYSTEM_REGEXP
diff --git a/src/modules/Ssleay/ssleay.c b/src/modules/Ssleay/ssleay.c
index fbbf63c6c2..39e3c5b7a6 100644
--- a/src/modules/Ssleay/ssleay.c
+++ b/src/modules/Ssleay/ssleay.c
@@ -7,14 +7,14 @@
 #include "config.h"
 
 #include "global.h"
-RCSID("$Id: ssleay.c,v 1.3 1997/03/13 23:41:08 nisse Exp $");
+RCSID("$Id: ssleay.c,v 1.4 1997/03/17 03:10:48 hubbe Exp $");
 #include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "backend.h"
 #include "program.h"
 #include "threads.h"
diff --git a/src/modules/Yp/yp.c b/src/modules/Yp/yp.c
index cb47767b72..5deaff489d 100644
--- a/src/modules/Yp/yp.c
+++ b/src/modules/Yp/yp.c
@@ -19,7 +19,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/_Crypto/cbc.c b/src/modules/_Crypto/cbc.c
index 4c3944675f..3147bb1144 100644
--- a/src/modules/_Crypto/cbc.c
+++ b/src/modules/_Crypto/cbc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cbc.c,v 1.6 1997/03/12 12:21:13 hubbe Exp $
+ * $Id: cbc.c,v 1.7 1997/03/17 03:11:14 hubbe Exp $
  *
  * CBC (Cipher Block Chaining Mode) crypto module for Pike.
  *
@@ -18,7 +18,7 @@
 #include "interpret.h"
 #include "svalue.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 #include "object.h"
 #include "stralloc.h"
diff --git a/src/modules/_Crypto/crypto.c b/src/modules/_Crypto/crypto.c
index 4741db00fa..5975138838 100644
--- a/src/modules/_Crypto/crypto.c
+++ b/src/modules/_Crypto/crypto.c
@@ -1,5 +1,5 @@
 /*
- * $Id: crypto.c,v 1.17 1997/03/12 12:21:14 hubbe Exp $
+ * $Id: crypto.c,v 1.18 1997/03/17 03:11:15 hubbe Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -16,7 +16,7 @@
 #include "interpret.h"
 #include "svalue.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 #include "object.h"
 #include "interpret.h"
diff --git a/src/modules/_Crypto/des.c b/src/modules/_Crypto/des.c
index c0c99aaa29..c67dfef6a3 100644
--- a/src/modules/_Crypto/des.c
+++ b/src/modules/_Crypto/des.c
@@ -1,5 +1,5 @@
 /*
- * $Id: des.c,v 1.6 1997/03/11 03:14:39 nisse Exp $
+ * $Id: des.c,v 1.7 1997/03/17 03:11:15 hubbe Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -18,7 +18,7 @@
 #include "interpret.h"
 #include "svalue.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 #include "object.h"
 #include "stralloc.h"
diff --git a/src/modules/_Crypto/invert.c b/src/modules/_Crypto/invert.c
index 7df44fc15d..1ea00de08a 100644
--- a/src/modules/_Crypto/invert.c
+++ b/src/modules/_Crypto/invert.c
@@ -1,5 +1,5 @@
 /*
- * $Id: invert.c,v 1.5 1997/03/11 03:16:23 nisse Exp $
+ * $Id: invert.c,v 1.6 1997/03/17 03:11:15 hubbe Exp $
  *
  * INVERT crypto module for Pike
  *
@@ -18,7 +18,7 @@
 #include "interpret.h"
 #include "svalue.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 #include "object.h"
 #include "stralloc.h"
diff --git a/src/modules/_Crypto/md2.c b/src/modules/_Crypto/md2.c
index 1414edd6cf..b570eaa987 100644
--- a/src/modules/_Crypto/md2.c
+++ b/src/modules/_Crypto/md2.c
@@ -1,5 +1,5 @@
 /*
- * $Id: md2.c,v 1.2 1997/03/11 03:16:36 nisse Exp $
+ * $Id: md2.c,v 1.3 1997/03/17 03:11:16 hubbe Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -18,7 +18,7 @@
 #include "interpret.h"
 #include "svalue.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 #include "object.h"
 #include "stralloc.h"
diff --git a/src/modules/_Crypto/pipe.c b/src/modules/_Crypto/pipe.c
index 23405e51d0..066610e8fe 100644
--- a/src/modules/_Crypto/pipe.c
+++ b/src/modules/_Crypto/pipe.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pipe.c,v 1.6 1997/03/12 12:21:14 hubbe Exp $
+ * $Id: pipe.c,v 1.7 1997/03/17 03:11:16 hubbe Exp $
  *
  * PIPE crypto module for Pike.
  *
@@ -18,7 +18,7 @@
 #include "interpret.h"
 #include "svalue.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 #include "object.h"
 #include "stralloc.h"
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index 395e1a4749..b08cabe537 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -10,7 +10,7 @@
 #include "stralloc.h"
 #include "array.h"
 #include "mapping.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "fd_control.h"
 #include "threads.h"
 #include "module_support.h"
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index bde0cf7673..db26fb7a79 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -6,14 +6,14 @@
 #define READ_BUFFER 8192
 
 #include "global.h"
-RCSID("$Id: file.c,v 1.30 1997/03/14 04:38:54 hubbe Exp $");
+RCSID("$Id: file.c,v 1.31 1997/03/17 03:12:04 hubbe Exp $");
 #include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "backend.h"
 #include "fd_control.h"
 
diff --git a/src/modules/files/socket.c b/src/modules/files/socket.c
index 5bd3bf9c55..38fc38a099 100644
--- a/src/modules/files/socket.c
+++ b/src/modules/files/socket.c
@@ -10,7 +10,7 @@
 #include "stralloc.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "backend.h"
 #include "fd_control.h"
 #include "threads.h"
diff --git a/src/modules/readline/readlinemod.c b/src/modules/readline/readlinemod.c
index ceaa4ed132..6aa2001375 100644
--- a/src/modules/readline/readlinemod.c
+++ b/src/modules/readline/readlinemod.c
@@ -11,7 +11,7 @@
 #include "stralloc.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "threads.h"
 
 #ifndef HAVE_LIBTERMCAP
diff --git a/src/modules/spider/accesseddb.c b/src/modules/spider/accesseddb.c
index 16765cd53c..53a66ffa1e 100644
--- a/src/modules/spider/accesseddb.c
+++ b/src/modules/spider/accesseddb.c
@@ -3,7 +3,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "backend.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/spider/discdate.c b/src/modules/spider/discdate.c
index 94af7e9669..e93a04dbf3 100644
--- a/src/modules/spider/discdate.c
+++ b/src/modules/spider/discdate.c
@@ -11,7 +11,7 @@
 #include "global.h"
 #include "stralloc.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 4c3ee25142..4e7abc266e 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,14 +1,14 @@
 #include <config.h>
 
 #include "global.h"
-RCSID("$Id: dumudp.c,v 1.6 1997/03/13 18:10:22 grubba Exp $");
+RCSID("$Id: dumudp.c,v 1.7 1997/03/17 03:13:16 hubbe Exp $");
 #include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "backend.h"
 #include "fd_control.h"
 
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index 3ca7d359c5..108c5c5402 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -25,7 +25,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/spider/stardate.c b/src/modules/spider/stardate.c
index 87976198bf..7a4908cbae 100644
--- a/src/modules/spider/stardate.c
+++ b/src/modules/spider/stardate.c
@@ -3,7 +3,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/modules/spider/streamed_parser.c b/src/modules/spider/streamed_parser.c
index e735b6ea21..782d7f5ff0 100644
--- a/src/modules/spider/streamed_parser.c
+++ b/src/modules/spider/streamed_parser.c
@@ -1,7 +1,7 @@
 #include "stralloc.h"
 #include "global.h"
 #include "types.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
 #include "interpret.h"
diff --git a/src/multiset.c b/src/multiset.c
index 24b959a8ac..806ad63283 100644
--- a/src/multiset.c
+++ b/src/multiset.c
@@ -8,7 +8,7 @@
 #include "types.h"
 #include "multiset.h"
 #include "svalue.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "memory.h"
 #include "error.h"
 #include "dynamic_buffer.h"
diff --git a/src/object.c b/src/object.c
index 3cc7868bcf..bcf2644df4 100644
--- a/src/object.c
+++ b/src/object.c
@@ -4,14 +4,14 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: object.c,v 1.15 1997/03/12 12:15:28 hubbe Exp $");
+RCSID("$Id: object.c,v 1.16 1997/03/17 03:04:42 hubbe Exp $");
 #include "object.h"
 #include "dynamic_buffer.h"
 #include "interpret.h"
 #include "program.h"
 #include "stralloc.h"
 #include "svalue.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "memory.h"
 #include "error.h"
 #include "main.h"
diff --git a/src/macros.h b/src/pike_macros.h
similarity index 100%
rename from src/macros.h
rename to src/pike_macros.h
diff --git a/src/pike_types.c b/src/pike_types.c
index 0a5ae85b8c..d91d53b1cc 100644
--- a/src/pike_types.c
+++ b/src/pike_types.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: pike_types.c,v 1.19 1997/03/14 04:37:18 hubbe Exp $");
+RCSID("$Id: pike_types.c,v 1.20 1997/03/17 03:04:43 hubbe Exp $");
 #include <ctype.h>
 #include "svalue.h"
 #include "pike_types.h"
@@ -16,7 +16,7 @@ RCSID("$Id: pike_types.c,v 1.19 1997/03/14 04:37:18 hubbe Exp $");
 #include "object.h"
 #include "multiset.h"
 #include "mapping.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "error.h"
 #include "las.h"
 #include "language.h"
diff --git a/src/port.c b/src/port.c
index 1ffb135f9d..0058d73d94 100644
--- a/src/port.c
+++ b/src/port.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "time_stuff.h"
 #include <ctype.h>
 #include <math.h>
diff --git a/src/program.c b/src/program.c
index 3da19cf80d..925eeb0e2b 100644
--- a/src/program.c
+++ b/src/program.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: program.c,v 1.27 1997/03/11 23:32:33 grubba Exp $");
+RCSID("$Id: program.c,v 1.28 1997/03/17 03:04:43 hubbe Exp $");
 #include "program.h"
 #include "object.h"
 #include "dynamic_buffer.h"
@@ -13,7 +13,7 @@ RCSID("$Id: program.c,v 1.27 1997/03/11 23:32:33 grubba Exp $");
 #include "las.h"
 #include "language.h"
 #include "lex.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "fsort.h"
 #include "error.h"
 #include "docode.h"
diff --git a/src/signal_handler.c b/src/signal_handler.c
index 25e8c7bb98..9c8784142e 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -8,7 +8,7 @@
 #include "interpret.h"
 #include "stralloc.h"
 #include "constants.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "backend.h"
 #include "error.h"
 #include "callback.h"
diff --git a/src/stralloc.c b/src/stralloc.c
index 93d1c58135..298ab38b56 100644
--- a/src/stralloc.c
+++ b/src/stralloc.c
@@ -5,9 +5,9 @@
 \*/
 #include "global.h"
 #include "stralloc.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "dynamic_buffer.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "memory.h"
 #include "error.h"
 
diff --git a/src/threads.c b/src/threads.c
index 7991c916b9..d5a2d7aa0e 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -1,5 +1,5 @@
 #include "global.h"
-RCSID("$Id: threads.c,v 1.19 1997/03/12 12:15:29 hubbe Exp $");
+RCSID("$Id: threads.c,v 1.20 1997/03/17 03:04:44 hubbe Exp $");
 
 int num_threads = 1;
 int threads_disabled = 0;
@@ -8,7 +8,7 @@ int threads_disabled = 0;
 #include "threads.h"
 #include "array.h"
 #include "object.h"
-#include "macros.h"
+#include "pike_macros.h"
 #include "callback.h"
 
 
-- 
GitLab