Changeset 803631e in OpenModelica for OMCompiler/SimulationRuntime/c/meta/meta_modelica_builtin.c

Timestamp:

2023-03-27T16:20:17+02:00 (14 months ago)

Author:

Per Östlund <perost86@…>

Parents:

02fef0b9

git-author:

Per Östlund <perost86@…> (03/27/23 14:31:47)

git-committer:

Per Östlund <perost86@…> (03/27/23 16:20:17)

Message:

Fix intString/stringInt on 64-bit Windows

• Change intString to use the PRINT_MMC_SINT_T macro for the format string instead of assuming it's a long, and change to snprintf just to be safe.
• Change stringInt to use modelica_integer instead of long, and use MODELICA_INT_MIN/MAX instead of INT_MIN/MAX.

File:

• OMCompiler/SimulationRuntime/c/meta/meta_modelica_builtin.c (modified) (2 diffs)

OMCompiler/SimulationRuntime/c/meta/meta_modelica_builtin.c

@@ -50 +50 @@
   if (i>=0 && i<=9) /* Small integers are used so much it makes sense to cache them */
     return mmc_strings_len1['0'+i];
-  sprintf(buffer, "%ld", (long) i);
+  snprintf(buffer, 22, "%" PRINT_MMC_SINT_T, i);
   res = mmc_mk_scon(buffer);
   MMC_CHECK_STRING(res);
@@ -81 +81 @@
 modelica_integer nobox_stringInt(threadData_t *threadData,metamodelica_string s)
 {
-  long res;
+  modelica_integer res;
   char *endptr,*str=MMC_STRINGDATA(s);
   MMC_CHECK_STRING(s);
   errno = 0;
+#if defined(_WIN64) || defined(__MINGW64__)
+  res = strtoll(str,&endptr,10);
+#else
   res = strtol(str,&endptr,10);
+#endif
   if (errno != 0 || str == endptr)
     MMC_THROW_INTERNAL();
   if (*endptr != '\0')
     MMC_THROW_INTERNAL();
-  if (res > INT_MAX || res < INT_MIN)
+  if (res > MODELICA_INT_MAX || res < MODELICA_INT_MIN)
     MMC_THROW_INTERNAL();
   return res;