conflicting types for OpenModelica_updateUriMapping

[Henning Kiel]

Compilation fails on OSX at several points.
I compiled from a fresh git clone:

clang -O2 -fno-stack-protector  -Wno-parentheses-equality -Wno-unused-variable -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -I"/Users/om/src/OpenModelica/build/include/omc/c" -I../Util/  -DADD_METARECORD_DEFINITIONS=  -c -o build/CodegenUtilSimulation.o build/CodegenUtilSimulation.c
In file included from build/CodegenUtilSimulation.c:401:
In file included from build/CodegenUtilSimulation_includes.h:9:
build/System.h:30:13: error: conflicting types for 'OpenModelica_updateUriMapping'
extern void OpenModelica_updateUriMapping(OpenModelica_threadData_ThreadData, modelica_metatype /*_namesAndDirs*/);
            ^
/Users/om/src/OpenModelica/build/include/omc/c/util/utility.h:130:13: note: previous declaration is here
extern void OpenModelica_updateUriMapping(threadData_t *threadData, void *namesAndDirs);
            ^
1 error generated.
gmake[4]: *** [<builtin>: build/CodegenUtilSimulation.o] Error 1

The other failure is in OMSimulator (with this error and many more of the same form):

/Users/om/src/OpenModelica/OMSimulator/src/OMSimulatorLib/./TLMBusConnector.h:40:26: error: non-aggregate type 'std::vector<int>' cannot be initialized with an initializer list
    std::vector<int> c = {2,3,4,5,6,7,8,9,10,11};

I use

clang version 3.9.1 (tags/RELEASE_391/final)
Target: x86_64-apple-darwin16.7.0
Thread model: posix
InstalledDir: /opt/local/libexec/llvm-3.9/bin