- fix Windows build (ansi C).

adrpo · adrpo · commit dd3c9f1bfc46 · 2013-06-19T02:23:57.000Z
- small fix to CPP Makefile.omdev.mingw. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16394 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c
@@ -643,7 +643,9 @@ int solveHybrd(DATA *data, int sysNumber)
     /* solution found */
     if(solverData->info == 1 || xerror <= local_tol || xerror_scaled <= local_tol)
     {
-      success = 1;
+	  int scaling;
+      
+	  success = 1;
       nfunc_evals += solverData->nfev;
       if(ACTIVE_STREAM(LOG_NLS))
       {
@@ -655,7 +657,7 @@ int solveHybrd(DATA *data, int sysNumber)
         printStatus(solverData, &nfunc_evals, &xerror, &xerror_scaled, LOG_NLS);
 
       }
-      int scaling = solverData->useXScaling;
+      scaling = solverData->useXScaling;
       if(scaling)
         solverData->useXScaling = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,9 @@ int solveHybrd(DATA *data, int sysNumber)`
`643`	`643`	`/* solution found */`
`644`	`644`	`if(solverData->info == 1 \|\| xerror <= local_tol \|\| xerror_scaled <= local_tol)`
`645`	`645`	`{`
`646`		`- success = 1;`
	`646`	`+ int scaling;`
	`647`	`+`
	`648`	`+ success = 1;`
`647`	`649`	`nfunc_evals += solverData->nfev;`
`648`	`650`	`if(ACTIVE_STREAM(LOG_NLS))`
`649`	`651`	`{`
`@@ -655,7 +657,7 @@ int solveHybrd(DATA *data, int sysNumber)`
`655`	`657`	`printStatus(solverData, &nfunc_evals, &xerror, &xerror_scaled, LOG_NLS);`
`656`	`658`
`657`	`659`	`}`
`658`		`- int scaling = solverData->useXScaling;`
	`660`	`+ scaling = solverData->useXScaling;`
`659`	`661`	`if(scaling)`
`660`	`662`	`solverData->useXScaling = 0;`
`661`	`663`