From 2ddb31725980a9c882e4b356b0f7aa90aad1f25d Mon Sep 17 00:00:00 2001
From: Frank Voorburg <voorburg@feaser.com>
Date: Thu, 19 Jan 2023 12:57:09 +0000
Subject: [PATCH] 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
---
 .../port/windows/canif/vector/xlLoadlib.c     |   6 +++---
 Host/libopenblt.dll                           | Bin 1393664 -> 1393664 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Host/Source/LibOpenBLT/port/windows/canif/vector/xlLoadlib.c b/Host/Source/LibOpenBLT/port/windows/canif/vector/xlLoadlib.c
index 7b3e4f49..6ec85582 100644
--- a/Host/Source/LibOpenBLT/port/windows/canif/vector/xlLoadlib.c
+++ b/Host/Source/LibOpenBLT/port/windows/canif/vector/xlLoadlib.c
@@ -263,13 +263,13 @@ XLstatus xlLoadLibrary(char const * library){
   
   if (!hxlDll){
 #ifdef _MFC_VER
-  #ifdef WIN64
+  #ifdef _WIN64
       MessageBox(NULL,"Dynamic XL Driver Library - not found (vxlapi64.dll)","XL API",MB_OK|MB_ICONEXCLAMATION);
   #else
       MessageBox(NULL,"Dynamic XL Driver Library - not found (vxlapi.dll)","XL API",MB_OK|MB_ICONEXCLAMATION);
   #endif
 #else
-  #ifdef WIN64
+  #ifdef _WIN64
     printf("Dynamic XL Driver Library - not found (vxlapi64.dll)\n");
   #else
     printf("Dynamic XL Driver Library - not found (vxlapi.dll)\n");
@@ -531,7 +531,7 @@ XLstatus xlUnloadLibrary(void){
 
 XLstatus xlOpenDriver(void){
   
-#ifdef WIN64
+#ifdef _WIN64
   if (xlLoadLibrary("vxlapi64")!=XL_SUCCESS) return XL_ERR_CANNOT_OPEN_DRIVER;
 #else
   if (xlLoadLibrary("vxlapi")!=XL_SUCCESS) return XL_ERR_CANNOT_OPEN_DRIVER;
diff --git a/Host/libopenblt.dll b/Host/libopenblt.dll
index c444db4dc85487e2866fc5a084fc823a0296df45..8529603ac8540d6afcddd9f3e24e0e460e87966a 100644
GIT binary patch
delta 1504
zcmW;M3rtpJ9LI6aix&jBy+9hPU^z7v36oJx46%{rjFh75v=C!CQ7IY_S!u*zB2D7*
zMdhv`n95CkTTW|9ECMsLG_(?%X(kqnWjeL>|8=(SK70OWd(NKi*;!wly1qEIJ;?F?
zer|6;h~o)yoCBL(5AXBzl{qIJr+}t%C(6m-n0SnvB8q7h#sr=gE(*jI+Qkq2Bo5+R
zX*6@cC}V|KN11q$!(u*{#Y`qv89^i&t{Zh^S2;7BKd9GqfPT@<b<xHYjIBH=3Ry3*
z*dx+8Es_~qZ6p#aqDT`Fyf1t?Xt-|Ga;e%r@f%@VY<hzE;xKDPBQ;_Zy<#m_MGBL)
z8gp4JB6&;ru}fU#lsLzzZAL${gokCKi4sxC$D){D#hbWmj0_UQb7YEmwuq_ph;T;4
zXd-KkVICJ}$QM2A6dimgYH;d|BBI4>ydaiREFNXQn9VQZE&}U~am0%uR*JJ!iLW>!
z_A@LRxU<11VWG$&SER8+JjHR5z`tTTGa8LBo)umciV-@+1<r~A#y1)LJSaS5h$hNK
zDW8cvu838HZ#R~)KrG>P5l^GIm#;-QH-ta;>@bE&6=!%?^w1_+`B7|Q+=oUkabh{?
zB8kl+hC^Z!zl#7SG~1=P4oS^+DbDk%EuCZ3iBISgd$=YVn7q>{Aw}fyj!0v-Sj2!x
zU`&f~AG5_|UJ^l+8m=2v9BldjYG2fJfY4T>n?%vZ8nKmaqL42|9)F8;?%ri2^Mpub
zortAXOy#5q$NMA0pBUlAQZd3taRHAw&Uw*I@NUDyL!yaQqLgZp#}^`<zeF+-dyGUD
ziCEqc5i|=oC&cKgy>_r`6-4i~gI(r%TRJBx620sb`#2}+31~AmGDocD6|tB~F^A8^
z6#f*!+|h2E-YjQfyKQ=r99ufyvRxeF8_~ioQNr{NV-3%UCA=qM=@1e8EL`|?8drEg
z4Dzz*;{$PkPem(3qJrDIj9eZO%gGi=G>Dj@qg{^Wvb?QP)@W;tHP-U6##z3WpEcg{
zw*ss{E68)SEBI7rg#BaFz3g#WNmf*a+bb&Ht&x|#^Bl==uMP>yOF5nO&-Bpwo!J{|
z&R=S!XkNbCGcP|RwbmytHhM*7<}_bwCxjMxq9%q81^eXWWu|4VjEnWmdfUCgo0#sv
Q4Ml@9Lp_5t!y<3{5A*O5Hvj+t

delta 1502
zcmW;M4NO&K9LMo{?o~t-feR?Q9FCS~yl7@g$;?V*vYeEGFTE_LQV3a%LSuzYELaXj
zdHG@jDiR<ef@HTwN|SUoks_T=D}$_=W#Td&&2s&Jo$b5Np8wgNvuAsD3QN)oOVZkd
z9Zzq6S5c_r3w4~2%iPQAeJ8g&XB}q?_2o{ivyQLDll&uQGrhuyBwYkhByQ3!2KYhr
z5Kw8fF-PoVwb;yd@ghe>3crg7h^R6mNHW}>-Q-p|G0rV^YdT1;=;d$WV=6{HOGPP#
zVgm<6HWx%XqpFQX%oelB5YcQEUb+nT$U3f6+b6CQzSE}P@t8QlD`G!2qJpo)dTxo8
z-2J|hM5>s^+ai<}affr_3L|zIXSh#v^So$bi>T!jQN}N#2yczCjz>fWIbs1j#SBh}
zC~k;Arqmk4EEbo@7kxB|PdOtRaO#Y0#EX2M5o;(BsT>w_`AJMAXtxnUqWFs}ahWRd
zEj{80*F`gv_Za1*hyvD&EE>eK^owNfh*`w!H72uM`16jq%^`7(AH^VJ>y0x!B)Z8I
zEtHE&J{N`jA#$0t&&VWMtl)LAfW2Z4eIkn6BAjUr#xQB(5}QOH2So?piwZ`6U~J?;
zv6fY0F=ZlwBO-?1#CRq&+NE%+Nour9ah2C>>71iZ9OI-o%&=(Yo+hK5r$hl8MHa2%
zY0ise{F;r2xnIQbf{38haC@Mu`TwhZS<^wn_8YxCDtxRH_3RR*d?^aKDYA)bG16Hg
z7V(xyWWSifSrLWjLnEA-!k_2FZQc{t@QL&MEP4rPHM*H6TF4faREt86i){WB=|mnd
z7V(5g<V_JxqnN~L5m?n`2Xj>t-)0B9!Ae^?7bzC~d?Y?&P&6^_ps|Cw;tgIB%c&HP
zb4<iDBqnlKyKOq6f|PdKbcj4#Iv3a{j`NLZ=U-9Iy&Xm#%ft#ci$pp^G#5nxV-6WN
zNf5uXMx17cI7+wZ;Hs!$VyCf@g<>taVljI}Lh-3i$8uX9YlJn@^0P)+{?=$Kz#3zX
zwF0eiR*)6!JJlI-?og!tV^_KCaa&1NY=zeqoA1@gW$%1FnckN}gWt`~^V^!6x}<Dq
z=>n&9USsk6e6MeQerQ^)fBfp4oaq5B7qt_@iv997<Yc^><%^04yB6Y`Rp4FdVdfV>
Qn~DeG!h8d9;Zw%{2gkP$djJ3c