Import Upstream version 5e2upstream/5e2

1 files changed, 14 insertions, 14 deletions

diff --git a/dynl.c b/dynl.c
index a1a0c37..d8eeae4 100644
--- a/dynl.c
+++ b/dynl.c
@@ -110,14 +110,14 @@ SCM l_dyn_main_call(symb, shl, args)
      SCM symb, shl, args;
 {
   int i;
-  int (*func)(int argc, char **argv) = 0;
-  char **argv;
+  int (*func)(int argc, const char **argv) = 0;
+  const char **argv;
 /*  SCM oloadpath = *loc_loadpath; */
   ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_main_call);
   DEFER_INTS;
   argv = makargvfrmstrs(args, s_main_call);
   if ((i = dld_function_executable_p(CHARS(symb))))
-    func = (int (*) (int argc, char **argv)) dld_get_func(CHARS(symb));
+    func = (int (*) (int argc, const char **argv)) dld_get_func(CHARS(symb));
   else dld_perror("DLDP");
   if (!i) listundefs();
   if (!func) {
@@ -235,8 +235,8 @@ SCM l_dyn_main_call(symb, shl, args)
      SCM symb, shl, args;
 {
   int i;
-  int (*func)P((int argc, char **argv)) = 0;
-  char **argv;
+  int (*func)P((int argc, const char **argv)) = 0;
+  const char **argv;
 /*  SCM oloadpath = *loc_loadpath; */
   ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_main_call);
   ASRTER(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_main_call);
@@ -369,7 +369,7 @@ sizet frshl(ptr)
 # if 0
   /* Should freeing a shl close and possibly unmap the object file it */
   /* refers to? */
-  if(SHL(ptr))
+  if (SHL(ptr))
     dlclose(SHL(ptr));
 # endif
   return 0;
@@ -392,7 +392,7 @@ SCM l_dyn_link(fname)
 {
   SCM z;
   void *handle;
-  if FALSEP(fname) return fname;
+  if (FALSEP(fname)) return fname;
   ASRTER(NIMP(fname) && STRINGP(fname), fname, ARG1, s_link);
   NEWCELL(z);
   DEFER_INTS;
@@ -447,8 +447,8 @@ SCM l_dyn_main_call(symb, shl, args)
 	SCM symb, shl, args;
 {
   int i;
-  int (*func)P((int argc, char **argv)) = 0;
-  char **argv;
+  int (*func)P((int argc, const char **argv)) = 0;
+  const char **argv;
 /*  SCM oloadpath = *loc_loadpath; */
   ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_main_call);
   ASRTER(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_main_call);
@@ -519,7 +519,7 @@ sizet frshl(ptr)
 # if 0
   /* Should freeing a shl close and possibly unmap the object file it */
   /* refers to? */
-  if(SHL(ptr))
+  if (SHL(ptr))
     dlclose(SHL(ptr));
 # endif
   return 0;
@@ -548,7 +548,7 @@ SCM l_dyn_link(fname)
   Ptr mainAddr;
   Str255 errMessage;
 
-  if FALSEP(fname) return fname;
+  if (FALSEP(fname)) return fname;
   ASRTER(NIMP(fname) && STRINGP(fname), fname, ARG1, s_link);
   NEWCELL(z);
   DEFER_INTS;
@@ -602,8 +602,8 @@ SCM l_dyn_main_call(symb, shl, args)
 	SCM symb, shl, args;
 {
   int i;
-  int (*func)P((int argc, char **argv)) = 0;
-  char **argv;
+  int (*func)P((int argc, const char **argv)) = 0;
+  const char **argv;
   OSErr err;
   CFragSymbolClass symClass;
   Str255 symName;
@@ -734,7 +734,7 @@ SCM scm_dyn_main_call(symb, shl, args)
 {
   int i;
   FARPROC func;
-  char **argv;
+  const char **argv;
   ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_main_call);
   ASRTER(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_main_call);
   DEFER_INTS;