From 7422abb42a7b01614a915fde980c6eed78753da5 Mon Sep 17 00:00:00 2001
From: Paulo Matos <pmatos@linki.tools>
Date: Wed, 26 Jun 2019 17:03:12 +0200
Subject: [PATCH] Remove reference to NO_SCHEME_EXNS (#2712)

---
 racket/src/racket/src/env.c     |  4 ----
 racket/src/racket/src/error.c   | 15 ---------------
 racket/src/racket/src/schpriv.h |  4 ----
 3 files changed, 23 deletions(-)

diff --git a/racket/src/racket/src/env.c b/racket/src/racket/src/env.c
index c2b6d2573c..4e44c9b479 100644
--- a/racket/src/racket/src/env.c
+++ b/racket/src/racket/src/env.c
@@ -279,9 +279,7 @@ static void init_startup_env(void)
   MZTIMEIT(eval, scheme_init_eval(env));
   MZTIMEIT(struct, scheme_init_struct(env));
   MZTIMEIT(error, scheme_init_error(env));
-#ifndef NO_SCHEME_EXNS
   MZTIMEIT(exn, scheme_init_exn(env));
-#endif
   MZTIMEIT(process, scheme_init_thread(env));
   scheme_init_port_wait();
   scheme_init_inspector();
@@ -478,9 +476,7 @@ static Scheme_Env *place_instance_init(void *stack_base, int initial_main_os_thr
   scheme_init_port_fun_config();
   scheme_init_error_config();
   scheme_init_logger_config();
-#ifndef NO_SCHEME_EXNS
   scheme_init_exn_config();
-#endif
   scheme_init_error_config();
   scheme_init_place_per_place();
 
diff --git a/racket/src/racket/src/error.c b/racket/src/racket/src/error.c
index 879641a115..53517ef15d 100644
--- a/racket/src/racket/src/error.c
+++ b/racket/src/racket/src/error.c
@@ -2708,7 +2708,6 @@ static Scheme_Object *do_error(const char *who, int mode, int argc, Scheme_Objec
     newargs[0] = scheme_make_immutable_sized_utf8_string(str, len);
   }
 
-#ifndef NO_SCHEME_EXNS
   newargs[1] = TMP_CMARK_VALUE;
   do_raise(scheme_make_struct_instance(exn_table[mode].type,
 				       2, newargs),
@@ -2716,12 +2715,6 @@ static Scheme_Object *do_error(const char *who, int mode, int argc, Scheme_Objec
            1);
 
   return scheme_void;
-#else
-  _scheme_apply_multi(scheme_get_param(scheme_current_config(), MZCONFIG_ERROR_DISPLAY_HANDLER), 1, newargs);
-
-  return _scheme_tail_apply(scheme_get_param(scheme_current_config(), MZCONFIG_ERROR_ESCAPE_HANDLER),
-			    0, NULL);
-#endif
 }
 
 static Scheme_Object *error(int argc, Scheme_Object *argv[])
@@ -4393,7 +4386,6 @@ scheme_raise_exn(int id, ...)
   alen = sch_vsprintf(NULL, 0, msg, args, &buffer, &errno_val, &unsupported);
   HIDE_FROM_XFORM(va_end(args));
 
-#ifndef NO_SCHEME_EXNS
   eargs[0] = scheme_make_immutable_sized_utf8_string(buffer, alen);
   eargs[1] = TMP_CMARK_VALUE;
   if (errno_val) {
@@ -4415,13 +4407,8 @@ scheme_raise_exn(int id, ...)
 				       c, eargs),
 	   1,
            1);
-#else
-  call_error(buffer, alen, scheme_false);
-#endif
 }
 
-#ifndef NO_SCHEME_EXNS
-
 static Scheme_Object *
 def_exn_handler(int argc, Scheme_Object *argv[])
 {
@@ -4802,5 +4789,3 @@ void scheme_init_exn_config(void)
 
   scheme_set_root_param(MZCONFIG_INIT_EXN_HANDLER, h);
 }
-
-#endif
diff --git a/racket/src/racket/src/schpriv.h b/racket/src/racket/src/schpriv.h
index 11914a7f0c..1ad348e48a 100644
--- a/racket/src/racket/src/schpriv.h
+++ b/racket/src/racket/src/schpriv.h
@@ -370,9 +370,7 @@ void scheme_init_bool(Scheme_Startup_Env *env);
 void scheme_init_syntax(Scheme_Startup_Env *env);
 void scheme_init_marshal(Scheme_Startup_Env *env);
 void scheme_init_error(Scheme_Startup_Env *env);
-#ifndef NO_SCHEME_EXNS
 void scheme_init_exn(Scheme_Startup_Env *env);
-#endif
 void scheme_init_debug(Scheme_Startup_Env *env);
 void scheme_init_thread(Scheme_Startup_Env *env);
 void scheme_init_unsafe_port(Scheme_Startup_Env *env);
@@ -464,9 +462,7 @@ void scheme_init_port_fun_config(void);
 void scheme_init_resolver_config(void);
 Scheme_Config *scheme_init_error_escape_proc(Scheme_Config *c);
 void scheme_init_error_config(void);
-#ifndef NO_SCHEME_EXNS
 void scheme_init_exn_config(void);
-#endif
 #ifdef WINDOWS_PROCESSES
 void scheme_init_thread_memory(void);
 #endif