修正Linux下的问题

Author: mepwang

QuantBox_CTP_Quote/QuantBox_CTP_Quote.depend

@@ -257,7 +257,7 @@
 	<set>
 	<string>
 
-1427789621 source:/home/mep/dev/broker/oss/QuantBox_XAPI/QuantBox_CTP_Quote/main.cpp
+1427872161 source:/home/mep/dev/broker/oss/QuantBox_XAPI/QuantBox_CTP_Quote/main.cpp
 	"stdafx.h"
 	"../include/ApiHeader.h"
 	"../include/QueueEnum.h"

QuantBox_Queue/MsgQueue.cpp

@@ -89,4 +89,4 @@ void CMsgQueue::RunInThread()
 	// 清理线程
 	m_hThread = nullptr;
 	m_bRunning = false;
-}
+}

QuantBox_XAPI/XApiC.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 
+#include <stdio.h>
 #include <string.h>
 #include "../include/XApiC.h"
 #include "../include/QueueHeader.h"
@@ -21,7 +22,7 @@ void* X_LoadLib(char* libPath)
 #if defined WINDOWS
 	return LoadLibraryExA(libPath, nullptr, LOAD_WITH_ALTERED_SEARCH_PATH);
 #else
-    return dlopen(libPath, RTLD_LAZY);
+    return dlopen(libPath, RTLD_NOW);
 #endif
 }
 
@@ -41,7 +42,8 @@ char* X_GetLastError()
     return (char*)lpMsgBuf;
 #else
     extern int errno;
-    return strerror(errno);
+    errno = 0;
+    return dlerror();
 #endif
 }
 

QuantBox_XAPI/XApiImpl.cpp

@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include <stdio.h>
 #include <string.h>
 #include "XApiImpl.h"
 
@@ -122,7 +123,6 @@ bool CXApiImpl::Init()
 			return true;
 		}
 	}
-
 	return false;
 }
 

QuantBox_XAPI_TEST/QuantBox_XAPI_TEST.cpp

@@ -51,8 +51,13 @@ class CXSpiImpl :public CXSpi
 int main(int argc, char* argv[])
 {
 	CXSpiImpl* p = new CXSpiImpl();
+#if defined WINDOWS
 	char DLLPath1[250] = "C:\\Program Files\\SmartQuant Ltd\\OpenQuant 2014\\XAPI\\CTP\\x86\\QuantBox_CTP_Quote.dll";
 	char DLLPath2[250] = "C:\\Program Files\\SmartQuant Ltd\\OpenQuant 2014\\XAPI\\CTP\\x86\\QuantBox_CTP_Trade.dll";
+#else
+    char DLLPath1[250] = "libQuantBox_CTP_Quote.so";
+	char DLLPath2[250] = "libQuantBox_CTP_Trade.so";
+#endif
 
 	ServerInfoField				m_ServerInfo1 = { 0 };
 	ServerInfoField				m_ServerInfo2 = { 0 };
@@ -88,8 +93,13 @@ int main(int argc, char* argv[])
 		pApi1->RegisterSpi(p);
 		pApi2->RegisterSpi(p);
 
-		pApi1->Connect("D:\\", &m_ServerInfo1, &m_UserInfo, 1);
+#if defined WINDOWS
+        pApi1->Connect("D:\\", &m_ServerInfo1, &m_UserInfo, 1);
 		pApi2->Connect("D:\\", &m_ServerInfo2, &m_UserInfo, 1);
+#else
+		pApi1->Connect("./", &m_ServerInfo1, &m_UserInfo, 1);
+		pApi2->Connect("./", &m_ServerInfo2, &m_UserInfo, 1);
+#endif
 
 		getchar();