From 3d5cbad9d63bf4e16c045606e1b3d34c826c2093 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Tue, 23 Jul 2002 16:06:10 +0200
Subject: [PATCH] Reverted the ugliness that tries to support
main(array(string) args). It isn't compatible when the type for main is
underspecified for one reason or the other, and it's very ugly to call a
callback differently depending on its type.
Rev: lib/master.pike.in:1.210
---
lib/master.pike.in | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/lib/master.pike.in b/lib/master.pike.in
index 310a958b8e..166b051868 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -6,7 +6,7 @@
// Pike is distributed under GPL, LGPL and MPL. See the file COPYING
// for more information.
//
-// $Id: master.pike.in,v 1.209 2002/07/16 18:47:20 hop Exp $
+// $Id: master.pike.in,v 1.210 2002/07/23 14:06:10 mast Exp $
#pike __REAL_VERSION__
@@ -1908,15 +1908,8 @@ void _main(array(string) orig_argv, array(string) env)
exit(1);
}
- function(array(string):int) newmain;
- if( _typeof(script->main) <= typeof(newmain) ) {
- if(trace) predef::trace(trace);
- i = script->main( argv );
- }
- else {
- if(trace) predef::trace(trace);
- i = script->main( sizeof(argv), argv, env );
- }
+ if(trace) predef::trace(trace);
+ i=script->main(sizeof(argv),argv,env);
if(i >=0) exit(i);
_async=1;
--
GitLab