Print this page
make: unifdef for NSE (undefined)
*** 44,58 ****
/*
* File table of contents
*/
static void add_macro_to_global_list(Name macro_to_add);
- #ifdef NSE
- static void expand_value_with_daemon(Name name, register Property macro, register String destination, Boolean cmd);
- #else
static void expand_value_with_daemon(Name, register Property macro, register String destination, Boolean cmd);
- #endif
static void init_arch_macros(void);
static void init_mach_macros(void);
static Boolean init_arch_done = false;
static Boolean init_mach_done = false;
--- 44,54 ----
*** 627,648 ****
init_mach_macros();
}
}
/* Get the macro value. */
macro = get_prop(name->prop, macro_prop);
- #ifdef NSE
- if (nse_watch_vars && nse && macro != NULL) {
- if (macro->body.macro.imported) {
- nse_shell_var_used= name;
- }
- if (macro->body.macro.value != NULL){
- if (nse_backquotes(macro->body.macro.value->string)) {
- nse_backquote_seen= name;
- }
- }
- }
- #endif
if ((macro != NULL) && macro->body.macro.is_conditional) {
conditional_macro_used = true;
/*
* Add this conditional macro to the beginning of the
* global list.
--- 623,632 ----
*** 919,931 ****
wchar_t wc_buf[STRING_BUFFER_LENGTH];
char mb_buf[STRING_BUFFER_LENGTH];
FILE *pipe;
Name value;
int set_host, set_target;
- #ifdef NSE
- Property macro;
- #endif
const char *mach_command = NOCATGETS("/bin/mach");
set_host = (get_prop(host_arch->prop, macro_prop) == NULL);
set_target = (get_prop(target_arch->prop, macro_prop) == NULL);
--- 903,912 ----
*** 944,966 ****
fatal_mksh(catgets(libmksdmsi18n_catd, 1, 186, "Execute of %s failed"), mach_command);
}
value = GETNAME(result_string.buffer.start, wslen(result_string.buffer.start));
- #ifdef NSE
- macro = setvar_daemon(host_arch, value, false, no_daemon, true, 0);
- macro->body.macro.imported= true;
- macro = setvar_daemon(target_arch, value, false, no_daemon, true, 0);
- macro->body.macro.imported= true;
- #else
if (set_host) {
(void) setvar_daemon(host_arch, value, false, no_daemon, true, 0);
}
if (set_target) {
(void) setvar_daemon(target_arch, value, false, no_daemon, true, 0);
}
- #endif
}
}
/*
* init_mach_macros(void)
--- 925,940 ----
*** 1030,1066 ****
* turn \ quoting off
*
* Global variables used:
*/
static void
- #ifdef NSE
- expand_value_with_daemon(Name name, register Property macro, register String destination, Boolean cmd)
- #else
expand_value_with_daemon(Name, register Property macro, register String destination, Boolean cmd)
- #endif
{
register Chain chain;
- #ifdef NSE
- if (reading_dependencies) {
- /*
- * Processing the dependencies themselves
- */
- depvar_dep_macro_used(name);
- } else {
- /*
- * Processing the rules for the targets
- * the nse_watch_vars flags chokes off most
- * checks. it is true only when processing
- * the output from a recursive make run
- * which is all we are interested in here.
- */
- if (nse_watch_vars) {
- depvar_rule_macro_used(name);
- }
- }
- #endif
switch (macro->body.macro.daemon) {
case no_daemon:
if (!svr4 && !posix) {
expand_value(macro->body.macro.value, destination, cmd);
--- 1004,1017 ----
*** 1134,1146 ****
register Chain chain;
Name val;
wchar_t *val_string = (wchar_t*)NULL;
Wstring wcb;
- #ifdef NSE
- macro->body.macro.imported = false;
- #endif
if ((makefile_type != reading_nothing) &&
macro->body.macro.read_only) {
return macro;
}
--- 1085,1094 ----