micropolis-activity: fails to build with clang instead of gcc

Your package fails to build with clang instead of gcc. [-Wreturn-type]
The attached patch fixes it.

diff --git a/src/tcl/tclenv.c b/src/tcl/tclenv.c
index be330e14b2f50de291bf8b38badfb6077c3906cf..e85089191eb1fdd0d5dd572fca554ad5965d3130 100644 (file)
--- a/src/tcl/tclenv.c
+++ b/src/tcl/tclenv.c
@@ -58,7 +58,7 @@ static char *         EnvTraceProc _ANSI_ARGS_((ClientData clientData,
 static int             FindVariable _ANSI_ARGS_((char *name, int *lengthPtr));
 
 void                   setenv_tcl _ANSI_ARGS_((char *name, char *value));
 static int             FindVariable _ANSI_ARGS_((char *name, int *lengthPtr));
 
 void                   setenv_tcl _ANSI_ARGS_((char *name, char *value));

-int                    unsetenv_tcl _ANSI_ARGS_((char *name));
+void                   unsetenv_tcl _ANSI_ARGS_((char *name));

 
 \f
 /*
 
 \f
 /*


@@ -277,7 +277,7 @@ setenv_tcl(name, value)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-int
+void

 unsetenv_tcl(name)
     char *name;                        /* Name of variable to remove. */
 {
 unsetenv_tcl(name)
     char *name;                        /* Name of variable to remove. */
 {

diff --git a/src/tclx/src/tclxgdat.y b/src/tclx/src/tclxgdat.y
index e29d7ead98a87d8a48e49c2edbed0248e937eef9..93b1610b8755b707bf354983fa52d87b65c97f64 100644 (file)
--- a/src/tclx/src/tclxgdat.y
+++ b/src/tclx/src/tclxgdat.y
@@ -580,8 +580,8 @@ Tcl_GetDate (p, now, zone)
  * Error message are not used, so discard with dummy function.
  */
 
  * Error message are not used, so discard with dummy function.
  */
 

-void
+int

 yyerror(msg)
 yyerror(msg)

-    char *msg;
+    const char *msg;

 {
 }
 {
 }