src/tclx/tkucbsrc/makefile: Micropolis build fixes for recent macOS

[micropolis] / src / sim / s_eval.c

diff --git a/src/sim/s_eval.c b/src/sim/s_eval.c
index acbb6ed63ed93efcf55a0c497caf5bb4fbeeec1a..e308229e306931603f2300fdacd0e4275f8104ec 100644 (file)
--- a/src/sim/s_eval.c
+++ b/src/sim/s_eval.c
@@ -77,8 +77,16 @@ short CityClass;                     /*  0..5  */
 short CityScore, deltaCityScore, AverageCityScore;
 short TrafficAverage;
 
 short CityScore, deltaCityScore, AverageCityScore;
 short TrafficAverage;
 

+void DoVotes(void);
+void GetScore(void);
+void VoteProblems(void);
+void DoProblems(void);
+void DoPopNum(void);
+void GetAssValue(void);
+

 
 /* comefrom: SpecialInit Simulate */
 
 /* comefrom: SpecialInit Simulate */

+void

 CityEvaluation(void)
 {
   EvalValid = 0;
 CityEvaluation(void)
 {
   EvalValid = 0;


@@ -98,6 +106,7 @@ CityEvaluation(void)
 
 
 /* comefrom: CityEvaluation SetCommonInits */
 
 
 /* comefrom: CityEvaluation SetCommonInits */

+void

 EvalInit(void)
 {
   register short x, z;
 EvalInit(void)
 {
   register short x, z;


@@ -120,6 +129,7 @@ EvalInit(void)
 
 
 /* comefrom: CityEvaluation */
 
 
 /* comefrom: CityEvaluation */

+void

 GetAssValue(void)
 {
   QUAD z;
 GetAssValue(void)
 {
   QUAD z;


@@ -139,6 +149,7 @@ GetAssValue(void)
 
 
 /* comefrom: CityEvaluation */
 
 
 /* comefrom: CityEvaluation */

+void

 DoPopNum(void)
 {
   QUAD OldCityPop;
 DoPopNum(void)
 {
   QUAD OldCityPop;


@@ -160,10 +171,11 @@ DoPopNum(void)
 
 
 /* comefrom: CityEvaluation */
 
 
 /* comefrom: CityEvaluation */

+void

 DoProblems(void)
 {
   register short x, z;
 DoProblems(void)
 {
   register short x, z;

-  short ThisProb, Max;
+  short ThisProb = 0, Max;

 
   for (z = 0; z < PROBNUM; z++)
     ProblemTable[z] = 0;
 
   for (z = 0; z < PROBNUM; z++)
     ProblemTable[z] = 0;


@@ -198,9 +210,10 @@ DoProblems(void)
 
 
 /* comefrom: DoProblems */
 
 
 /* comefrom: DoProblems */

+void

 VoteProblems(void)
 {
 VoteProblems(void)
 {

-  register x, z, count;
+  register int x, z, count;

 
   for (z = 0; z < PROBNUM; z++)
     ProblemVotes[z] = 0;
 
   for (z = 0; z < PROBNUM; z++)
     ProblemVotes[z] = 0;


@@ -221,6 +234,7 @@ VoteProblems(void)
 
 
 /* comefrom: DoProblems */
 
 
 /* comefrom: DoProblems */

+int

 AverageTrf(void)
 {
   QUAD TrfTotal;
 AverageTrf(void)
 {
   QUAD TrfTotal;


@@ -241,6 +255,7 @@ AverageTrf(void)
 
 
 /* comefrom: DoProblems */
 
 
 /* comefrom: DoProblems */

+int

 GetUnemployment(void)
 {
   float r;
 GetUnemployment(void)
 {
   float r;


@@ -260,6 +275,7 @@ GetUnemployment(void)
 
 
 /* comefrom: DoProblems GetScore */
 
 
 /* comefrom: DoProblems GetScore */

+int

 GetFire(void)
 {
   short z;
 GetFire(void)
 {
   short z;


@@ -273,9 +289,10 @@ GetFire(void)
 
 
 /* comefrom: CityEvaluation */
 
 
 /* comefrom: CityEvaluation */

+void

 GetScore(void)
 {
 GetScore(void)
 {

-  register x, z;
+  register int x, z;

   short OldCityScore;
   float SM, TM;
 
   short OldCityScore;
   float SM, TM;
 


@@ -329,9 +346,10 @@ GetScore(void)
 
 
 /* comefrom: CityEvaluation */
 
 
 /* comefrom: CityEvaluation */

+void

 DoVotes(void)
 {
 DoVotes(void)
 {

-  register z;
+  register int z;

 
   CityYes = 0;
   CityNo = 0;
 
   CityYes = 0;
   CityNo = 0;