- in Linux you get sometime linker duplicate errors for function "err…

…msg". changed the "errmsg" name to "_errmesg" git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3455 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 15, 2008 · 2e03f6f · 2e03f6f
1 parent 7f7a1ea
commit 2e03f6f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/c_runtime/sendData/humbug.cpp b/c_runtime/sendData/humbug.cpp
@@ -39,7 +39,7 @@
 
 using namespace std;
 
-void errmsg()
+void _errmesg()
 {
     cerr << "OMC is compiled without Qt. Check the QTHOME environment variable and recompile." << endl;
 }
@@ -49,91 +49,91 @@ bool Static::enabled_ = false;
 bool ellipse(double x0, double y0, double x1, double y1, const char* color, int colorR, int colorG, int colorB, const char* fillColor, int fillColorR, int fillColorG, int fillColorB)
 {
 
-	errmsg();
+	_errmesg();
 	return true;
 }
 
 bool rect(double x0, double y0, double x1, double y1, const char* color, int colorR, int colorG, int colorB, const char* fillColor, int fillColorR, int fillColorG, int fillColorB)
 {
 
 
-	errmsg();
+	_errmesg();
 	return true;
 }
 
 bool line(double x0, double y0, double x1, double y1, const char* color, int colorR, int colorG, int colorB, const char* fillColor, int fillColorR, int fillColorG, int fillColorB)
 {
-	errmsg();
+	_errmesg();
 	return true;
 }
 
 
 bool hold(int status)
 {
 
-	errmsg();
+	_errmesg();
 	return true;
 }
 
 bool pltWait(unsigned long msecs)
 {
 
-	errmsg();
+	_errmesg();
 	return true;
 }
 
 void emulateStreamData(const char* data, const char* title, const char* xLabel, const char* yLabel, const char* interpolation5, int legend, int grid, int logX, int logY, int drawPoints, const char* range)
 {
-	errmsg();
+	_errmesg();
 }
 
 bool plt(const char* var, const char* model, const char* title, const char* xLabel, const char* yLabel, bool legend, bool grid, double xmin, double xmax, double ymin, double ymax, bool logX, bool logY, const char* interpolation, bool drawPoints, const char* range)
 {
-	errmsg();
+	_errmesg();
         return true;
 }
 
 void setVariableFilter(const char* variables)
 {
-	errmsg();
+	_errmesg();
         return;
 }
 
 void setDataPort(int port)
 {
-	errmsg();
+	_errmesg();
         return;
 }
 
 void enableSendData(int enable)
 {
-	errmsg();
+	_errmesg();
         return;
 }
 
 	//void initSendData(int variableCount, const char* variableNames);
 void initSendData(int variableCount1, int variableCount2, char** statesNames, char** stateDerivativesNames,  char** algebraicsNames)
 {
-	errmsg();
+	_errmesg();
         return;
 }
 
 void sendPacket(const char* data)
 {
-	errmsg();
+	_errmesg();
         return;
 }
 
 
 void closeSendData()
 {
-	errmsg();
+	_errmesg();
         return;
 }
 
 bool pltTable(double*, size_t r, size_t c) //, const char*, int size);
 {
-	errmsg();
+	_errmesg();
         return true;
 }	
 
@@ -145,14 +145,14 @@ bool Static::enabled()
 
 int getVariableListSize(const char* model)
 {
-	errmsg();
+	_errmesg();
 	return 0;
 
 }
 
 bool getVariableList(const char* model, char* lst)
 {
-	errmsg();
+	_errmesg();
 	return false;
 
 }
diff --git a/c_runtime/sendData/humbug.h b/c_runtime/sendData/humbug.h
@@ -58,7 +58,7 @@ class Static
 	*/
 };
 
-void errmsg();
+void _errmesg();
 /*
 	void emulateStreamData(const char* data, int port=7778, const char* title="Plot by OpenModelica", const char* xLabel = "time", const char* yLabel = "", const char* interpolation="linear", int legend = 1, int grid = 1, double xMin=0, double xMax=0, double yMin=0, double yMax=0, int logX=0, int logY=0, int drawPoints = 1, const char* range = "0.0,0.0 0.0,0.0");