From f26d33033bc1eca3ad5e377c4b8f3780d932a463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Fri, 5 Jun 1998 20:03:23 -0700
Subject: [PATCH] bugfixed for NT (hopefully)
Rev: lib/master.pike.in:1.31
---
lib/master.pike.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/master.pike.in b/lib/master.pike.in
index 251127c9b4..222d8e650f 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,4 +1,4 @@
-/* $Id: master.pike.in,v 1.30 1998/05/27 22:49:37 hubbe Exp $
+/* $Id: master.pike.in,v 1.31 1998/06/06 03:03:23 hubbe Exp $
*
* Master-file for Pike.
*
@@ -561,16 +561,16 @@ void _main(string *orig_argv, string *env)
#if defined(__NT__) && !defined(NOT_INSTALLED)
function rget=lambda(string ent) {
- return
- RegGetValue(HKEY_CURRENT_USER,"SOFTWARE\\Idonex\\Pike\\0.6",ent) ||
- RegGetValue(HKEY_LOCAL_MACHINE,"SOFTWARE\\Idonex\\Pike\\0.6",ent) ;
+ catch { return RegGetValue(HKEY_CURRENT_USER,"SOFTWARE\\Idonex\\Pike\\0.6",ent); };
+ catch { return RegGetValue(HKEY_LOCAL_MACHINE,"SOFTWARE\\Idonex\\Pike\\0.6",ent); };
+
};
string tmppath=rget("share_prefix");
// add path for architecture-shared files
add_include_path(tmppath+"/include");
add_module_path(tmppath+"/modules");
- string tmp=rget("lib_prefix");
+ tmppath=rget("lib_prefix");
// add path for architecture-dependant files
add_include_path(tmppath+"/include");
add_module_path(tmppath+"/modules");
--
GitLab