Skip to content

Commit b0d2b7f

Browse files
author
Jens Frenkel
committed
- fix for asprintf on windows mingw and msvc
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15080 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 99fa25e commit b0d2b7f

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

SimulationRuntime/c/simulation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SET(simulation_sources options.cpp simulation_input_xml.cpp simulation_runtime.
1515
modelinfo.c simulation_info_xml.c)
1616

1717
SET(simulation_headers options.h simulation_input_xml.h simulation_runtime.h modelinfo.h simulation_info_xml.h
18-
../linearization/linearize.h ../simulation_data.h ../omc_inline.h ../omc_msvc.h ../openmodelica.h ../openmodelica_func.h)
18+
../linearization/linearize.h ../simulation_data.h ../omc_inline.h ../util/omc_msvc.h ../openmodelica.h ../openmodelica_func.h)
1919

2020
# Library util
2121
ADD_DEFINITIONS(/DNO_INTERACTIVE_DEPENDENCY)

SimulationRuntime/c/util/omc_msvc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929
*/
3030

3131
#include "omc_msvc.h"
32+
#include <stdarg.h>
3233
#include <stdio.h>
3334

34-
#if defined(_MSC_VER)
35+
#if defined(__MINGW32__) || defined(_MSC_VER)
3536
int asprintf(char **strp, const char *fmt, ...) {
3637
int len;
3738
va_list ap;
@@ -41,7 +42,7 @@ int asprintf(char **strp, const char *fmt, ...) {
4142
*strp = malloc(len+1);
4243
len = snprintf(strp, len+1, fmt, ap);
4344

44-
va_end(args);
45+
va_end(ap);
4546
return len;
4647
}
4748
#endif

SimulationRuntime/c/util/omc_msvc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ static union MSVC_FLOAT_HACK __NAN = {{0x00, 0x00, 0xC0, 0x7F}};
6565
#define snprintf sprintf_s
6666
#endif
6767

68+
6869
int asprintf(char **strp, const char *fmt, ...);
6970

7071
#endif

0 commit comments

Comments
 (0)