mirror of https://github.com/FOME-Tech/openblt.git
Refs #1657. Corrected macro WIN64 to _WIN64 to fix assertion error when using Vector CAN hardware.
git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@1016 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
parent
c338f20843
commit
2ddb317259
|
@ -263,13 +263,13 @@ XLstatus xlLoadLibrary(char const * library){
|
||||||
|
|
||||||
if (!hxlDll){
|
if (!hxlDll){
|
||||||
#ifdef _MFC_VER
|
#ifdef _MFC_VER
|
||||||
#ifdef WIN64
|
#ifdef _WIN64
|
||||||
MessageBox(NULL,"Dynamic XL Driver Library - not found (vxlapi64.dll)","XL API",MB_OK|MB_ICONEXCLAMATION);
|
MessageBox(NULL,"Dynamic XL Driver Library - not found (vxlapi64.dll)","XL API",MB_OK|MB_ICONEXCLAMATION);
|
||||||
#else
|
#else
|
||||||
MessageBox(NULL,"Dynamic XL Driver Library - not found (vxlapi.dll)","XL API",MB_OK|MB_ICONEXCLAMATION);
|
MessageBox(NULL,"Dynamic XL Driver Library - not found (vxlapi.dll)","XL API",MB_OK|MB_ICONEXCLAMATION);
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#ifdef WIN64
|
#ifdef _WIN64
|
||||||
printf("Dynamic XL Driver Library - not found (vxlapi64.dll)\n");
|
printf("Dynamic XL Driver Library - not found (vxlapi64.dll)\n");
|
||||||
#else
|
#else
|
||||||
printf("Dynamic XL Driver Library - not found (vxlapi.dll)\n");
|
printf("Dynamic XL Driver Library - not found (vxlapi.dll)\n");
|
||||||
|
@ -531,7 +531,7 @@ XLstatus xlUnloadLibrary(void){
|
||||||
|
|
||||||
XLstatus xlOpenDriver(void){
|
XLstatus xlOpenDriver(void){
|
||||||
|
|
||||||
#ifdef WIN64
|
#ifdef _WIN64
|
||||||
if (xlLoadLibrary("vxlapi64")!=XL_SUCCESS) return XL_ERR_CANNOT_OPEN_DRIVER;
|
if (xlLoadLibrary("vxlapi64")!=XL_SUCCESS) return XL_ERR_CANNOT_OPEN_DRIVER;
|
||||||
#else
|
#else
|
||||||
if (xlLoadLibrary("vxlapi")!=XL_SUCCESS) return XL_ERR_CANNOT_OPEN_DRIVER;
|
if (xlLoadLibrary("vxlapi")!=XL_SUCCESS) return XL_ERR_CANNOT_OPEN_DRIVER;
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue