Skip to content
Snippets Groups Projects
Commit 624e8584 authored by Marcus Comstedt's avatar Marcus Comstedt
Browse files

Fixed registry-stuff for NT.

Rev: lib/master.pike.in:1.50
Rev: src/main.c:1.73
parent 30320114
No related branches found
No related tags found
Loading
/* $Id: master.pike.in,v 1.49 1999/06/01 12:12:11 mirar Exp $
/* $Id: master.pike.in,v 1.50 1999/06/02 21:21:39 marcus Exp $
*
* Master-file for Pike.
*
......@@ -722,6 +722,24 @@ void _main(string *orig_argv, string *env)
}
#if defined(__NT__) && !defined(NOT_INSTALLED)
function rget=lambda(string ent) {
catch { return RegGetValue(HKEY_CURRENT_USER,"SOFTWARE\\Idonex\\Pike\\0.7",ent); };
catch { return RegGetValue(HKEY_LOCAL_MACHINE,"SOFTWARE\\Idonex\\Pike\\0.7",ent); };
};
string tmppath=rget("share_prefix");
// add path for architecture-shared files
add_include_path(tmppath+"/include");
add_module_path(tmppath+"/modules");
tmppath=rget("lib_prefix");
// add path for architecture-dependant files
add_include_path(tmppath+"/include");
add_module_path(tmppath+"/modules");
#else
#if "share_prefix"[0]!=''
// add path for architecture-dependant files
add_include_path("share_prefix/include");
......@@ -734,6 +752,8 @@ void _main(string *orig_argv, string *env)
add_module_path("lib_prefix/modules");
#endif
#endif
#ifndef NOT_INSTALLED
q=(getenv("PIKE_INCLUDE_PATH")||"")/":"-({""});
for(i=sizeof(q)-1;i>=0;i--) add_include_path(q[i]);
......
......@@ -5,7 +5,7 @@
\*/
/**/
#include "global.h"
RCSID("$Id: main.c,v 1.72 1999/05/08 00:38:42 hubbe Exp $");
RCSID("$Id: main.c,v 1.73 1999/06/02 21:21:38 marcus Exp $");
#include "fdlib.h"
#include "backend.h"
#include "module.h"
......@@ -105,7 +105,7 @@ static void get_master_key(long cat)
DWORD len=sizeof(buffer)-1,type=REG_SZ;
long ret;
if(RegOpenKeyEx(cat,
(LPCTSTR)"SOFTWARE\\Idonex\\Pike\\0.6",
(LPCTSTR)"SOFTWARE\\Idonex\\Pike\\0.7",
0,KEY_READ,&k)==ERROR_SUCCESS)
{
if(RegQueryValueEx(k,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment