[C] Pedantic, no C/C++ extensions for compilation (#15605)

AnHeuermann · web-flow · commit e769a61a85de · 2026-05-22T11:43:46.000+02:00
* Add `-Wpedantic -pedantic-errors` scoped to SimulationRuntime/c
  * Exclude meta_modelica_builtin_boxvar.h on GCC
* Add `-Werror=c20-extensions -Werror=c++20-extensions` for Clang to classifies these as error-level
* Add `-Werror=c23-extensions -Werror=c++23-extensions` for Clang to classifies these as error-level
* Excluding meta/meta_modelica_builtin_boxvar.h from pedantic, not compatible by design
* Fixing designated initializer usage in simulation_result_mat4.cpp
* Fixing pedantic errors in GBODE
  * Fixing cast signed / unsigned
  * Fixing zero-sized arrays
* Fixing pointer arithmetic on void pointers
* Updating __FUNCTION__ to C99 __func__
diff --git a/OMCompiler/Parser/Modelica.g b/OMCompiler/Parser/Modelica.g
@@ -121,7 +121,7 @@ goto rule ## func ## Ex; }}
   #define MMC_STRUCTHDR(x,y) 0
 #endif
 
-  #define NYI(void) fprintf(stderr, "NYI \%s \%s:\%d\n", __FUNCTION__, __FILE__, __LINE__); exit(1);
+  #define NYI(void) fprintf(stderr, "NYI \%s \%s:\%d\n", __func__, __FILE__, __LINE__); exit(1);
 
   #define PARSER_INFO(start) ((void*) SourceInfo__SOURCEINFO(ModelicaParser_filename_OMC, mmc_mk_bcon(ModelicaParser_readonly), mmc_mk_icon(start->line), mmc_mk_icon(start->line == 1 ? start->charPosition+2 : start->charPosition+1), mmc_mk_icon(LT(1)->line), mmc_mk_icon(LT(1)->charPosition+1), ModelicaParser_timeStamp))
   #if !defined(OMC_GENERATE_RELOCATABLE_CODE) || defined(OMC_BOOTSTRAPPING)
diff --git a/OMCompiler/SimulationRuntime/c/CMakeLists.txt b/OMCompiler/SimulationRuntime/c/CMakeLists.txt
@@ -8,6 +8,18 @@ set(C_STANDARD C17)
 set(C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS OFF)
 
+## Enforce standards as strictly as possible
+if(NOT MSVC)
+  add_compile_options(-Wpedantic -pedantic-errors)
+  # Clang puts designated-initializer warnings under -Werror=c23-extensions and
+  # -Wc++20-extensions / -Wc++23-extensions (warning-level, not
+  # extension-level), so -pedantic-errors alone does not promote them to errors.
+  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-Werror=c++20-extensions)
+    add_compile_options(-Werror=c23-extensions -Werror=c++23-extensions)
+  endif()
+endif()
+
 # ######################################################################################################################
 # INTERFACE target
 # Other targets can link to this interface to get the include path transitively.
diff --git a/OMCompiler/SimulationRuntime/c/meta/meta_modelica_builtin_boxvar.h b/OMCompiler/SimulationRuntime/c/meta/meta_modelica_builtin_boxvar.h
@@ -27,8 +27,17 @@
 
 /* Code generated by meta_modelica_gen_boxvar.py */
 
+#include "meta_modelica_data.h"
+
 #if !(defined(OMC_MINIMAL_RUNTIME) || defined(OMC_FMI_RUNTIME))
 
+/* This generated code intentionally casts function pointers to object pointers
+ * (void* / modelica_metatype) as part of the MetaModelica boxing mechanism. ISO
+ * C forbids this, but it is a well-defined GNU extension on all supported
+ * platforms. */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+
 #if !defined(OMC_GENERATE_RELOCATABLE_CODE)
 #define OMC_SYM_BOXPTR(X) &boxptr_##X
 #else
@@ -291,4 +300,6 @@ static const MMC_DEFSTRUCTLIT(boxvar_lit_valueHashMod,2,0) {(modelica_metatype)
 #define boxvar_valueHashMod MMC_REFSTRUCTLIT(boxvar_lit_valueHashMod)
 
 #undef OMC_SYM_BOXPTR
+
+#pragma GCC diagnostic pop
 #endif /* #if !(defined(OMC_MINIMAL_RUNTIME) || defined(OMC_FMI_RUNTIME)) */
diff --git a/OMCompiler/SimulationRuntime/c/meta/meta_modelica_gen_boxvar.py b/OMCompiler/SimulationRuntime/c/meta/meta_modelica_gen_boxvar.py
@@ -1,11 +1,42 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
+
+from datetime import datetime
+
+CURRENT_YEAR: int = datetime.now().year
+
+runtime_header = f"""/*
+ * This file belongs to the OpenModelica Run-Time System
+ *
+ * Copyright (c) 1998-{CURRENT_YEAR}, Open Source Modelica Consortium (OSMC), c/o Linköpings
+ * universitet, Department of Computer and Information Science, SE-58183 Linköping, Sweden. All rights
+ * reserved.
+ *
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THE BSD NEW LICENSE OR THE
+ * AGPL VERSION 3 LICENSE OR THE OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.8. ANY
+ * USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S
+ * ACCEPTANCE OF THE BSD NEW LICENSE OR THE OSMC PUBLIC LICENSE OR THE AGPL
+ * VERSION 3, ACCORDING TO RECIPIENTS CHOICE.
+ *
+ * The OpenModelica software and the OSMC (Open Source Modelica Consortium) Public License
+ * (OSMC-PL) are obtained from OSMC, either from the above address, from the URLs:
+ * http://www.openmodelica.org or https://github.com/OpenModelica/ or
+ * http://www.ida.liu.se/projects/OpenModelica, and in the OpenModelica distribution. GNU
+ * AGPL version 3 is obtained from: https://www.gnu.org/licenses/licenses.html#GPL. The BSD NEW
+ * License is obtained from: http://www.opensource.org/licenses/BSD-3-Clause.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY
+ * SET FORTH IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF
+ * OSMC-PL.
+ *
+ */
+"""
 
 functions = [
 'arrayAppend',
 'arrayCopy',
 'arrayGet',
 'arrayList',
-'arrayNth',
 'arrayUpdate',
 'boolAnd',
 'boolEq',
@@ -36,14 +67,14 @@
 'isNone',
 'isSome',
 'listAppend',
+'listAppendDestroy',
 'listArray',
 'listDelete',
 'listEmpty',
 'listGet',
 'listHead',
 'listLength',
 'listMember',
-'listNth',
 'listRest',
 'listReverse',
 'listReverseInPlace',
@@ -89,21 +120,31 @@
 'valueHashMod'
 ]
 
-print '/* Code generated by meta_modelica_gen_boxvar.py */'
-print ''
-print '#if !(defined(OMC_MINIMAL_RUNTIME) || defined(OMC_FMI_RUNTIME))'
-print ''
-print '#if !defined(OMC_GENERATE_RELOCATABLE_CODE)'
-print '#define OMC_SYM_BOXPTR(X) &boxptr_##X'
-print '#else'
-print '#define OMC_SYM_BOXPTR(X) &boxvar_fn_##X'
+print(runtime_header)
+print('/* Code generated by meta_modelica_gen_boxvar.py */')
+print('')
+print('#include "meta_modelica_data.h"')
+print('')
+print('#if !(defined(OMC_MINIMAL_RUNTIME) || defined(OMC_FMI_RUNTIME))')
+print('')
+print('/* This generated code intentionally casts function pointers to object pointers (void* /')
+print(' * modelica_metatype) as part of the MetaModelica boxing mechanism. ISO C forbids this,')
+print(' * but it is a well-defined GNU extension on all supported platforms. */')
+print('#pragma GCC diagnostic push')
+print('#pragma GCC diagnostic ignored "-Wpedantic"')
+print('')
+print('#if !defined(OMC_GENERATE_RELOCATABLE_CODE)')
+print('#define OMC_SYM_BOXPTR(X) &boxptr_##X')
+print('#else')
+print('#define OMC_SYM_BOXPTR(X) &boxvar_fn_##X')
 for f in functions:
-  print 'static void* boxvar_fn_%s = (void*) boxptr_%s;' % (f,f)
-print '#endif'
+  print('static void* boxvar_fn_%s = (void*) boxptr_%s;' % (f,f))
+print('#endif')
 for f in functions:
-  print 'static const MMC_DEFSTRUCTLIT(boxvar_lit_%s,2,0) {(modelica_metatype) OMC_SYM_BOXPTR(%s),0}};' % (f,f)
-  print '#define boxvar_%s MMC_REFSTRUCTLIT(boxvar_lit_%s)' % (f,f)
-print ''
-print '#undef OMC_SYM_BOXPTR'
-print '#endif /* #if !(defined(OMC_MINIMAL_RUNTIME) || defined(OMC_FMI_RUNTIME)) */'
-
+  print('static const MMC_DEFSTRUCTLIT(boxvar_lit_%s,2,0) {(modelica_metatype) OMC_SYM_BOXPTR(%s),0}};' % (f,f))
+  print('#define boxvar_%s MMC_REFSTRUCTLIT(boxvar_lit_%s)' % (f,f))
+print('')
+print('#undef OMC_SYM_BOXPTR')
+print('')
+print('#pragma GCC diagnostic pop')
+print('#endif /* #if !(defined(OMC_MINIMAL_RUNTIME) || defined(OMC_FMI_RUNTIME)) */')
diff --git a/OMCompiler/SimulationRuntime/c/meta/meta_modelica_segv.c b/OMCompiler/SimulationRuntime/c/meta/meta_modelica_segv.c
@@ -162,7 +162,8 @@ static void handler(int signo, siginfo_t *si, void *ptr)
 {
   int unused __attribute__((unused)), isStackOverflow;
   threadData_t *threadData = (threadData_t*)pthread_getspecific(mmc_thread_data_key);
-  isStackOverflow = si->si_addr < threadData->stackBottom && si->si_addr > threadData->stackBottom-LIMIT_FOR_STACK_OVERFLOW;
+  isStackOverflow = si->si_addr < threadData->stackBottom
+                 && (char*)si->si_addr > (char*)threadData->stackBottom - LIMIT_FOR_STACK_OVERFLOW;
   if (isStackOverflow) {
     mmc_setStacktraceMessages(1,0);
     sigprocmask(SIG_UNBLOCK, &segvset, NULL);
@@ -225,7 +226,7 @@ static void* getStackBase() {
   }
 #endif
   assert(size > 128*1024);
-  return stackBottom + 64*1024;
+  return (char*)stackBottom + 64*1024;
 }
 
 void init_metamodelica_segv_handler()
diff --git a/OMCompiler/SimulationRuntime/c/optimization/DataManagement/MoveData.c b/OMCompiler/SimulationRuntime/c/optimization/DataManagement/MoveData.c
@@ -811,7 +811,7 @@ void setLocalVars(OptData * optData, DATA * data, const double * const vopt,
     data->simulationInfo->inputVars[k-nx] = (modelica_real) vopt[shift + k]*vnom[k];
   }
 
-};
+}
 
 
 /*
diff --git a/OMCompiler/SimulationRuntime/c/simulation/results/simulation_result_mat4.cpp b/OMCompiler/SimulationRuntime/c/simulation/results/simulation_result_mat4.cpp
@@ -198,9 +198,9 @@ struct variableCount count_name_description_signals(const MODEL_DATA *mData,
                                                     modelica_boolean cpuTime)
 {
   struct variableCount count = {
-    .maxLengthName = strlen(timeName) + 1,
-    .maxLengthDesc = strlen(timeDesc) + 1,
-    .nSignals = 1};
+    strlen(timeName) + 1,
+    strlen(timeDesc) + 1,
+    1};
 
   /* CPU-time */
   if (cpuTime)
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/dassl.h b/OMCompiler/SimulationRuntime/c/simulation/solver/dassl.h
@@ -75,7 +75,8 @@ typedef struct DASSL_DATA{
   int (*jacobianFunction)(double *t, double *y, double *yprime, double *deltaD,
                           double *pd, double *cj, double *h, double *wt,
                           double *rpar, int* ipar);
-  void* zeroCrossingFunction;
+  int (*zeroCrossingFunction)(int *neqm, double *t, double *y, double *yp,
+                              int *ng, double *gout, double *rpar, int* ipar);
 
 #ifdef USE_PARJAC
   JACOBIAN* jacColumns;         /* thread local analytic jacobians */
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/embedded_server.c b/OMCompiler/SimulationRuntime/c/simulation/solver/embedded_server.c
@@ -108,11 +108,14 @@ void* embedded_server_load_functions(const char *server_name)
     errorStreamPrint(OMC_LOG_DEBUG, 0, "Failed to load function omc_embedded_server_update: %s\n", dlerror());
     MMC_THROW();
   }
-  embedded_server_init = funcInit;
-  wait_for_step = funcWaitForStep;
-  embedded_server_deinit = funcDeinit;
-  embedded_server_update = funcUpdate;
-  infoStreamPrint(OMC_LOG_DEBUG, 0, "Loaded embedded server");
+
+  // ISO C forbids assignment between function pointer and ‘void *’ [-Wpedantic]
+  // dlsym with -pedantic is tricky, the following workaround is from the dlsym man page but still a hack
+  *(void**)(&embedded_server_init) = funcInit;
+  *(void**)(&wait_for_step) = funcWaitForStep;
+  *(void**)(&embedded_server_deinit) = funcDeinit;
+  *(void**)(&embedded_server_update) = funcUpdate;
+
   return dll;
 }
 
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_main.h b/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_main.h
@@ -123,8 +123,8 @@ typedef struct DATA_GBODEF{
 
   /* statistics */
   SOLVERSTATS stats;
-  int fastStateUpdateCount;                         /* number of fast state updates */
-  int additionalFullODEEvaluations;                 /* number of overhead fODE evaluations without selection in fast steps */
+  unsigned int fastStateUpdateCount;                /* number of fast state updates */
+  unsigned int additionalFullODEEvaluations;        /* number of overhead fODE evaluations without selection in fast steps */
 } DATA_GBODEF;
 
 typedef struct DATA_GBODE{
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_tableau.c b/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_tableau.c
@@ -938,7 +938,7 @@ void getButcherTableau_RADAU_IA_4(BUTCHER_TABLEAU* tableau)
       -5.09194593702242144137000294311631453467, -9.359370126275934829659807517276652291987, -1.566681181856267151030109472634035397665, 0.1484870261226446416736623853207948772257,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 3.212806896871533982914109940306805502411, 4.787193103128466017085890059693194497589 };
   const double beta[] = { -4.773087433276642499827429345261277978816, -1.567476416895208124112099648396772661243 };
 
@@ -991,7 +991,7 @@ void getButcherTableau_RADAU_IIA_2(BUTCHER_TABLEAU* tableau)
       -3.181980515339463859803799629471820676782, 0.3535533905932737622004221810524245196425,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 2.0 };
   const double beta[] = { -1.41421356237309504880168872420969807857 };
 
@@ -1110,7 +1110,7 @@ void getButcherTableau_RADAU_IIA_4(BUTCHER_TABLEAU* tableau)
       -17.96130656749639676506023969758331297225, -5.389086980398025669078941718352030134169, -1.504742273383398638930933017879633925149, 0.545022919619391945643865700981719104208,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 3.212806896871533982914109940306805502411, 4.78719310312846601708589005969319449759 };
   const double beta[] = { -4.773087433276642499827429345261277978816, -1.567476416895208124112099648396772661243 };
 
@@ -1253,7 +1253,7 @@ void getButcherTableau_RADAU_IIA_6(BUTCHER_TABLEAU* tableau)
       -139.162365235214475741044940263579506341, -86.86394280102758379741501913701080348712, -17.68623066595332555896275574105054248767, 0.6289016427699384262857419024505555951776, -2.293422051615319474905768647962374667987, 1.051445880391877517282717746914888988258,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 4.038847534488800154166195229640030659658, 6.470514936701569753598584495713229000395, 7.490637528809630092235220274646740339948 };
   const double beta[] = { -8.345600414872215667958594699304708933405, -4.900121147421386424219683046996816065052, -1.621502388778393978353342752338923527676 };
 
@@ -1400,7 +1400,7 @@ void getButcherTableau_LOBATTO_IIIA_3(BUTCHER_TABLEAU* tableau)
     -0.5, 1.0
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 3.0 };
   const double beta[] = { -1.732050807568877293527446341505872366943 };
 
@@ -1520,7 +1520,7 @@ void getButcherTableau_LOBATTO_IIIB_3(BUTCHER_TABLEAU* tableau)
       -1.154700538379251529018297561003914911295, -0.5773502691896257645091487805019574556471,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 3.0 };
   const double beta[] = { -1.732050807568877293527446341505872366943 };
 
@@ -1696,7 +1696,7 @@ void getButcherTableau_LOBATTO_IIIC_4(BUTCHER_TABLEAU* tableau)
       -3.302757250041810136591302948414990966281, -5.341364646141195278576399308543633031624, -1.142921928129632462955369184619120229001, 0.341203583261795719175206722672451293619,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 2.220980032989806897423925140476047787088, 3.779019967010193102576074859523952212912 };
   const double beta[] = { -4.160391445506931982228485188880642430211, -1.380176524272843046226884893083007281595 };
 
@@ -1763,7 +1763,7 @@ void getButcherTableau_GAUSS2(BUTCHER_TABLEAU* tableau)
       -3.732050807568877293527446341505872366943, 0.0,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 3.0 };
   const double beta[] = { -1.732050807568877293527446341505872366943 };
 
@@ -1886,7 +1886,7 @@ void getButcherTableau_GAUSS4(BUTCHER_TABLEAU* tableau)
       -29.07934128989777863623880820139910620706, -10.92230382520138929261285243127942797139, -1.653799987630558089871389676805016519187, 0.2561579407420976532158914021132743634997,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 4.207578794359255663211212149448079704083, 5.792421205640744336788787850551920295917 };
   const double beta[] = { -5.31483608371350543371664419726353845149, -1.734468257869007503637946429840248583809 };
 
@@ -2028,7 +2028,7 @@ void getButcherTableau_GAUSS6(BUTCHER_TABLEAU* tableau)
       -260.357477667464378861674032468098642792, -174.8433416109965751208330708174578391066, -36.23587733711121805597974087130028813489, -1.822207721476954667948237294424499052019, -1.434475189058847998141941112030882310654, 0.4536875908856169837921210999406586510558,
   };
 
-  const double gamma[] = {  };
+  const double *gamma = NULL;
   const double alpha[] = { 5.031864495621642774245116554146952829577, 7.47141671265162933588272393956048621508, 8.496718791726727889872159506292560955338 };
   const double beta[] = { -8.985345907307885071836487841700655722412, -5.252544622894251280987103176618812732347, -1.735019346462731212772883142500590703561 };
 
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_util.c b/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_util.c
@@ -840,7 +840,7 @@ modelica_boolean checkFastStatesChange(DATA_GBODE* gbData)
  * @param stats             Pointer to stats struct.
  * @param fastStateUpdates  Number of fast state updates.
  */
-void logSolverStats(enum OMC_LOG_STREAM stream, const char* name, double timeValue, double integratorTime, double stepSize, SOLVERSTATS* stats, int *fastStateUpdates, int *additionalEvalsFODE)
+void logSolverStats(enum OMC_LOG_STREAM stream, const char* name, double timeValue, double integratorTime, double stepSize, SOLVERSTATS* stats, unsigned int *fastStateUpdates, unsigned int *additionalEvalsFODE)
 {
   if (OMC_ACTIVE_STREAM(stream)) {
     infoStreamPrint(stream, 1, "%s call statistics:", name);
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_util.h b/OMCompiler/SimulationRuntime/c/simulation/solver/gbode_util.h
@@ -74,7 +74,7 @@ void dumpFastStates_gbf(DATA_GBODE *gbData, double time, int rejectedType);
 
 modelica_boolean checkFastStatesChange(DATA_GBODE* gbData);
 
-void logSolverStats(enum OMC_LOG_STREAM stream, const char* name, double timeValue, double integratorTime, double stepSize, SOLVERSTATS* stats, int *fastStateUpdates, int *additionalEvalsFODE);
+void logSolverStats(enum OMC_LOG_STREAM stream, const char* name, double timeValue, double integratorTime, double stepSize, SOLVERSTATS* stats, unsigned int *fastStateUpdates, unsigned int *additionalEvalsFODE);
 
 void deprecationWarningGBODE(enum SOLVER_METHOD method);
 
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/jacobian_analysis.h b/OMCompiler/SimulationRuntime/c/simulation/solver/jacobian_analysis.h
@@ -114,7 +114,10 @@ typedef struct SVD_DATA {
     int least_one_percent;          // index for first singular value < 1% of largest
 } SVD_DATA;
 
-static inline modelica_real _svd_max2(modelica_real a, modelica_real b) { return (a > b ? a : b); };
+static inline modelica_real _svd_max2(modelica_real a, modelica_real b)
+{
+    return (a > b ? a : b);
+}
 
 // entry point for svd analysis
 int svd_compute(DATA *data, NONLINEAR_SYSTEM_DATA *nls_data, modelica_real *values, modelica_boolean scaled, SolverCaller caller);
diff --git a/OMCompiler/SimulationRuntime/c/simulation_data.h b/OMCompiler/SimulationRuntime/c/simulation_data.h
@@ -53,11 +53,7 @@
 #define OMC_LINEARIZE_DUMP_LANGUAGE_JULIA 2
 #define OMC_LINEARIZE_DUMP_LANGUAGE_PYTHON 3
 
-#if defined(_MSC_VER)
 #define set_struct(TYPE, x, info) { const TYPE tmp = info; x = tmp; }
-#else
-#define set_struct(TYPE, x, info) x = (TYPE)info
-#endif
 
 /* Forward declarations */
 typedef struct DATA DATA;
diff --git a/OMCompiler/SimulationRuntime/c/util/OldModelicaTables.c b/OMCompiler/SimulationRuntime/c/util/OldModelicaTables.c
diff --git a/OMCompiler/SimulationRuntime/c/util/java_interface.c b/OMCompiler/SimulationRuntime/c/util/java_interface.c
diff --git a/OMCompiler/SimulationRuntime/c/util/java_interface.h b/OMCompiler/SimulationRuntime/c/util/java_interface.h
diff --git a/OMCompiler/SimulationRuntime/c/util/omc_error.h b/OMCompiler/SimulationRuntime/c/util/omc_error.h
diff --git a/OMCompiler/SimulationRuntime/c/util/rtclock.c b/OMCompiler/SimulationRuntime/c/util/rtclock.c

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,8 @@ static void handler(int signo, siginfo_t si, void ptr)`
`162`	`162`	`{`
`163`	`163`	`int unused __attribute__((unused)), isStackOverflow;`
`164`	`164`	`threadData_t threadData = (threadData_t)pthread_getspecific(mmc_thread_data_key);`
`165`		`- isStackOverflow = si->si_addr < threadData->stackBottom && si->si_addr > threadData->stackBottom-LIMIT_FOR_STACK_OVERFLOW;`
	`165`	`+ isStackOverflow = si->si_addr < threadData->stackBottom`
	`166`	`+ && (char)si->si_addr > (char)threadData->stackBottom - LIMIT_FOR_STACK_OVERFLOW;`
`166`	`167`	`if (isStackOverflow) {`
`167`	`168`	`mmc_setStacktraceMessages(1,0);`
`168`	`169`	`sigprocmask(SIG_UNBLOCK, &segvset, NULL);`
`@@ -225,7 +226,7 @@ static void* getStackBase() {`
`225`	`226`	`}`
`226`	`227`	`#endif`
`227`	`228`	`assert(size > 128*1024);`
`228`		`- return stackBottom + 64*1024;`
	`229`	`+ return (char)stackBottom + 641024;`
`229`	`230`	`}`
`230`	`231`
`231`	`232`	`void init_metamodelica_segv_handler()`
Original file line number	Diff line number	Diff line change
`@@ -811,7 +811,7 @@ void setLocalVars(OptData * optData, DATA * data, const double * const vopt,`
`811`	`811`	`data->simulationInfo->inputVars[k-nx] = (modelica_real) vopt[shift + k]*vnom[k];`
`812`	`812`	`}`
`813`	`813`
`814`		`-};`
	`814`	`+}`
`815`	`815`
`816`	`816`
`817`	`817`	`/*`