Compile using CXX; feature-check C++ variadic macros (part of C++11)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24694 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 21, 2015 · 6382bf1 · 6382bf1
1 parent dd529a9
commit 6382bf1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -174,7 +174,7 @@ $(INITIALIZATIONOBJSPATH):%$(OBJ_EXT): %.c $(SOLVERHFILESPATH) $(INITIALIZATIONH
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(RESULTSOBJSPATH):%$(OBJ_EXT): %.cpp $(RESULTSFILESPATH) $(COMMON_HEADERS)
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CXX) -c $(CFLAGS) -o $@ $<
 
 $(SIMOBJSPATH):%$(OBJ_EXT): %.cpp linearization/linearize.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
 	$(CXX) -c -Ilinearization/ $(CXXFLAGS) -o $@ $<

diff --git a/SimulationRuntime/c/openmodelica.h b/SimulationRuntime/c/openmodelica.h
@@ -62,6 +62,10 @@ extern "C" {
 #define DLLDirection DLLExport
 #endif
 
+#if __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L
+#define HAVE_VA_MACROS 1
+#endif
+
 #include "openmodelica_types.h"
 #if defined(__MINGW32__) || defined(_MSC_VER)
  #define WIN32_LEAN_AND_MEAN
@@ -82,10 +86,6 @@ extern "C" {
 
 #include "omc_inline.h"
 
-#if __STDC_VERSION__ >= 199901L
-#define HAVE_VA_MACROS 1
-#endif
-
 /* BEFORE: fortran_types */
 #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
 typedef int fortran_integer;