diff --git a/src/ChangeLog b/src/ChangeLog
index 35d4e3c644ad5f7bab8707ef681199598287effe..6f963e4582c9f27849690a1cf8113ef3004eb26b 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 9eb14c622e86c9e0b0843ff258c9e4e200b6ff0c..0c749b884907344a502090654537c2a0a936a5f0 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 fe298f54723b0e00d8b3da1fd6af9ebff1230256..4441271462ec0b7491e26ee9e16d57f30c5e6f75 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 72a14549da62188c234cdfb3eebc7baa05ce3f87..7ab3d90ff81d6e31e3814596d97ab622136db56d 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 a19c5171e4c197ba1c17bd4c05954cea1bf44526..ab354663463822e125f53151a0fc25dd8d9b7bf4 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 9cff5c51433b611b710d527654f76b74e94e266b..b2fd327118dd4c01d16b36f8b07b15ebffc845cc 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 7ce16e46be7a158a3859b6b59134b3d1b025f3da..6c701f4a060251cbe9caa478c7a49afc825b568e 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 7dde4282ae9befb0a32da8fae8d7badec67b23b1..8f8834490d24d0cbefe7c6c596e76e13c02eeccc 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 72493f2b30d838c402f09555132d3c698d7c5104..1e0c968a681d2299b2465275befcec171dd18211 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 276c946f1a8d2cdb99b1d19c3dca45ee6be3b83d..bda2abb4814bb8979dbffa1e49f3fd0a867217e2 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 742996f4038688b257795f77813668d464f6bebd..539277363d7867ba47f2941b95988c04df9a01de 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 7e0b5d25fc04319ee04f4395ce993e2cc89ad551..379aca497080137624d49c02abd1571678ae79e1 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 6760ba7e7037693bbe60a4f7206027785e0e1e4c..de55d5a21c03d2a972c7e48426f7fc27f4fbd90f 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 d652b32114137a59cac7c635ab42412a35af836a..171412688f5483fd160fc12c3f6688a31fe4c2ea 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 5e234522dcac312f2340779aea904d949947b5d3..9040e10746dc89f188cbb1aa74d199b9ea2f7a24 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 a99396b29c49809927a24449bb483c9a64bb866c..7cf99d0bdaa0a5b5d9473803afae53a4efb7ff51 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 9b7b673a716be0a372185f96a1648a5dc1aa2867..4500a03fc82ed8e09284265559edbc7bb6c2c322 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 ee01ec75c04219ac7b68eb6d77da232725da00b2..1f269fbb49e90066f733be03b566982c582ef520 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 f2161aef48a96b0bfe7ef4d456b836ae383a2fae..1bd8c3923d8606a121fc5cb4d13c963cedd7786f 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 82374cddde9b33edfce4908410335820c816a36e..0158d59016e56eb92c900aabccded9be5817ab90 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 69b056dd3197272dfbf9f5746119965ac0d99e8a..fae36efccf618b476e598a791199f32bd3971bee 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 7c8f35628f9b23b606d73f9f70b0293dce8f8bad..61c08611b2ca55495bcc7d68907f20272afc4804 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 d019c3e4047cceeb3147672103e05284bb5c2c58..bdbc857173e208dc940388a019a394b18618cf5d 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 2bf3057ebf3647b2109ec399224da8d89b4424b0..e4f49b343caa6ed2719c79c07121fd21093e1227 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 e17819f3395293f8a1e7aa20f8b2b67c9cc9160a..ad1210527bbfcda0a5c0d8b8408c532aa76f391b 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 57ea00083fbeb69757a313d79e4c5fc23e1d7cd1..cb752958dcdd0d7f84f0ef71528d21906d4ea75d 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 b7ce956c09f34d26021b884317397e24fe5829f6..26c05921cec8b4740de7d8c67d42e57dcad61e11 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 478047a8f60737a183121bf6e5f933b192067224..6608512d3bd582e74460d2f210fac2a51b892643 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 7cde3f906c843b22c0946e4b6aba98d50bc95586..4089510b7f0def78c380a575860d5739ffc21756 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 3e20321398446a27f17cb91bb66bbfdc3956baf1..97a9ff8849c095ab0a6051905590c7e440a4ed27 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 1e2799196baaa5bb0bcd203533b743b0c399179b..2e4dac10a15b59f749fdca8bc6009b7553edcbf2 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 1775386234e9739f07635f22d4fbe7320fffca71..5f978356b93480a522b64166ceb28f2160292713 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 fbbf63c6c286d170c2eddf54119e1fbe967ba054..39e3c5b7a6f8dfa8637b1d49ffdd0745abe29bab 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 cb47767b72727fed9ecbdacd29e529186eedaa90..5deaff489df8378807360cdc7ea20e874ed2ccd2 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 4c3944675f9bd5adb69f215dfead2fde900662fb..3147bb1144db55d7f094277a092d2ded48f88038 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 4741db00fa33880098438ca120b99eeaab502985..5975138838d62fdc1cd1fb616fe291c8608f68fd 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 c0c99aaa2933e8dd634177f6d92c262ec55e23d6..c67dfef6a32cab6dc0997a2b9d2eda65560ded7e 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 7df44fc15d64f768c84585e1af7aca96ebaca879..1ea00de08a48c01a2de848754324458ffea5c4b7 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 1414edd6cfdb38061141c48e67a84b18b5acd97a..b570eaa98762f02958db0e3a584b8fe6e4b061ec 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 23405e51d07b9914f3a1f37fc63718bd16201303..066610e8feec33db18a5ab0d2c3d769477df7562 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 395e1a4749f77aa9d55470af66d0d3a48229bb24..b08cabe53777db5f29ae5ddb871e29f98569e5ca 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 bde0cf767327d62ba382effb54194b25faf75421..db26fb7a79d1998b1c891c1e92bb202215f0a17c 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 5bd3bf9c55c0f26103ea90cf7ae4ea62e5198a6e..38fc38a09986f7457499ba5e4246f50643a82e97 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 ceaa4ed132e6e1300e49248d34dbc5dca28a3e83..6aa2001375e34380c93973ac1b759ce43015f6dd 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 16765cd53c421cd57c062c6cd2a8b4e650e07579..53a66ffa1e1cee9320d7cdb16b5536ba43d23b54 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 94af7e9669d337e1fb8d3d243f4e7b0af54c4f56..e93a04dbf3dde12e772bd3ca085867bab31e1127 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 4c3ee2514234bee95d8a8c2bdba8f893ae57f3d2..4e7abc266eb9cae0ff2d7fd41b03a415ff4710b5 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 3ca7d359c52ba581258932e7b5905cf58b7c238a..108c5c54021979410510a964d1e196a4e1da78c2 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 87976198bf2244f7d59fae044ad8a68d36089bf2..7a4908cbae64ef6463f66baccdda7c7d95a1f351 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 e735b6ea21d4703aec074891fce87efdaf957aed..782d7f5ff079d0489b610e5b2be8b2b34d16914a 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 24b959a8acab43b1c68bd2cf39cbf4f74b7a72bf..806ad6328330057adae393ad3a56f0d13384a9ad 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 3cc7868bcfe845e385fab6a8409154f83df55596..bcf2644df4e98b1cbcb2eb10d7ded4e87e6b0a7a 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 0a5ae85b8cebe2239143cf292fd9cc4a88c9122d..d91d53b1cccc8dc2e6e5bf4a9590a66f43b78614 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 1ffb135f9d321950dc909699966e38494f8712f4..0058d73d94ecc95b8fbf78f16737cd4faf991d29 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 3da19cf80d02bf707fb10a8c974e9d969c1991de..925eeb0e2b5ca2cef0346659beee6d0a56ceb2de 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 25e8c7bb983bcdc7218c5c33e7257aefb42f9954..9c8784142ee5e188811664a1089d6e4f92fba251 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 93d1c58135550db8f45d7a6d103ba41c30104a0e..298ab38b56a8af6def35c01526dc75f0e27c5945 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 7991c916b98bdf92b2bd7300439bef24ba69766e..d5a2d7aa0e80979ecd13f0d800579633ffc21fec 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"