Corrected Visual C++ win32/net.h include file define.

bacnet-stack/ports/win32/bacnet/bacnet.dsp

@@ -189,11 +189,11 @@ SOURCE=..\..\..\src\datetime.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\debug.c
+SOURCE=..\..\..\src\dcc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\dcc.c
+SOURCE=..\..\..\src\debug.c
 # End Source File
 # Begin Source File
 
@@ -469,6 +469,10 @@ SOURCE=..\..\..\include\mstptext.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\net.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\include\npdu.h
 # End Source File
 # Begin Source File

bacnet-stack/ports/win32/bacnet/bacnet.plg

@@ -6,30 +6,16 @@
 --------------------Configuration: bacnet - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP34.tmp" with contents
+Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP18.tmp" with contents
 [
 /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\include\\" /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "BACAPP_ALL" /D PRINT_ENABLED=1 /D BIG_ENDIAN=0 /D "BACDL_BIP" /D USE_INADDR=1 /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\code\bacnet-stack\src\abort.c"
-"C:\code\bacnet-stack\src\address.c"
-"C:\code\bacnet-stack\demo\object\ai.c"
-"C:\code\bacnet-stack\demo\object\ao.c"
-"C:\code\bacnet-stack\src\apdu.c"
-"C:\code\bacnet-stack\src\arf.c"
-"C:\code\bacnet-stack\demo\object\av.c"
-"C:\code\bacnet-stack\src\bacapp.c"
-"C:\code\bacnet-stack\src\bacdcode.c"
-"C:\code\bacnet-stack\src\bacerror.c"
 "C:\code\bacnet-stack\demo\object\bacfile.c"
-"C:\code\bacnet-stack\src\bacreal.c"
-"C:\code\bacnet-stack\demo\object\bi.c"
 "C:\code\bacnet-stack\ports\win32\bip-init.c"
 "C:\code\bacnet-stack\src\bip.c"
-"C:\code\bacnet-stack\demo\object\bo.c"
-"C:\code\bacnet-stack\demo\object\bv.c"
 "C:\code\bacnet-stack\src\bvlc.c"
 "C:\code\bacnet-stack\src\cov.c"
-"C:\code\bacnet-stack\src\dcc.c"
 "C:\code\bacnet-stack\demo\object\device.c"
+"C:\code\bacnet-stack\ports\win32\dlmstp.c"
 "C:\code\bacnet-stack\demo\handler\h_arf.c"
 "C:\code\bacnet-stack\demo\handler\h_arf_a.c"
 "C:\code\bacnet-stack\demo\handler\h_cov.c"
@@ -39,23 +25,17 @@ Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP34.tmp" with conten
 "C:\code\bacnet-stack\demo\handler\h_whois.c"
 "C:\code\bacnet-stack\demo\handler\h_wp.c"
 "C:\code\bacnet-stack\src\iam.c"
-"C:\code\bacnet-stack\demo\object\lc.c"
-"C:\code\bacnet-stack\demo\object\lsp.c"
 "C:\code\bacnet-stack\ports\win32\main.c"
-"C:\code\bacnet-stack\demo\object\mso.c"
+"C:\code\bacnet-stack\src\mstp.c"
 "C:\code\bacnet-stack\demo\handler\noserv.c"
-"C:\code\bacnet-stack\src\npdu.c"
-"C:\code\bacnet-stack\src\reject.c"
-"C:\code\bacnet-stack\src\rp.c"
 "C:\code\bacnet-stack\demo\handler\s_rp.c"
 "C:\code\bacnet-stack\demo\handler\s_whois.c"
 "C:\code\bacnet-stack\demo\handler\s_wp.c"
 "C:\code\bacnet-stack\src\tsm.c"
-"C:\code\bacnet-stack\src\whois.c"
-"C:\code\bacnet-stack\src\wp.c"
+"C:\code\bacnet-stack\demo\handler\txbuf.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP34.tmp" 
-Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP35.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP18.tmp" 
+Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP19.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/bacnet.pdb" /debug /machine:I386 /out:"Debug/bacnet.exe" /pdbtype:sept 
 ".\Debug\abort.obj"
@@ -75,7 +55,6 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\bacstr.obj"
 ".\Debug\bactext.obj"
 ".\Debug\bi.obj"
-".\Debug\bigend.obj"
 ".\Debug\bip-init.obj"
 ".\Debug\bip.obj"
 ".\Debug\bo.obj"
@@ -84,6 +63,7 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\cov.obj"
 ".\Debug\crc.obj"
 ".\Debug\datetime.obj"
+".\Debug\debug.obj"
 ".\Debug\dcc.obj"
 ".\Debug\device.obj"
 ".\Debug\dlmstp.obj"
@@ -102,6 +82,7 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\main.obj"
 ".\Debug\mso.obj"
 ".\Debug\mstp.obj"
+".\Debug\mstptext.obj"
 ".\Debug\noserv.obj"
 ".\Debug\npdu.obj"
 ".\Debug\reject.obj"
@@ -117,32 +98,16 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\whois.obj"
 ".\Debug\wp.obj"
 ]
-Creating command line "link.exe @C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP35.tmp"
+Creating command line "link.exe @C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP19.tmp"
 <h3>Output Window</h3>
 Compiling...
-abort.c
-address.c
-ai.c
-ao.c
-apdu.c
-arf.c
-av.c
-bacapp.c
-bacdcode.c
-bacerror.c
 bacfile.c
-bacreal.c
-bi.c
 bip-init.c
 bip.c
-bo.c
-bv.c
 bvlc.c
 cov.c
-dcc.c
-Generating Code...
-Compiling...
 device.c
+dlmstp.c
 h_arf.c
 h_arf_a.c
 h_cov.c
@@ -152,25 +117,23 @@ h_rp_a.c
 h_whois.c
 h_wp.c
 iam.c
-lc.c
-lsp.c
 main.c
-mso.c
+mstp.c
 noserv.c
-npdu.c
-reject.c
-rp.c
 s_rp.c
-s_whois.c
 Generating Code...
+c:\code\bacnet-stack\src\mstp.c(676) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\src\mstp.c(706) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\src\mstp.c(1039) : warning C4761: integral size mismatch in argument; conversion supplied
+c:\code\bacnet-stack\ports\win32\dlmstp.c(451) : warning C4761: integral size mismatch in argument; conversion supplied
 Compiling...
+s_whois.c
 s_wp.c
 tsm.c
-whois.c
-wp.c
+txbuf.c
 Generating Code...
 Linking...
-Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP36.tmp" with contents
+Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP1B.tmp" with contents
 [
 /nologo /o"Debug/bacnet.bsc" 
 ".\Debug\abort.sbr"
@@ -190,7 +153,6 @@ Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP36.tmp" with conten
 ".\Debug\bacstr.sbr"
 ".\Debug\bactext.sbr"
 ".\Debug\bi.sbr"
-".\Debug\bigend.sbr"
 ".\Debug\bip-init.sbr"
 ".\Debug\bip.sbr"
 ".\Debug\bo.sbr"
@@ -199,6 +161,7 @@ Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP36.tmp" with conten
 ".\Debug\cov.sbr"
 ".\Debug\crc.sbr"
 ".\Debug\datetime.sbr"
+".\Debug\debug.sbr"
 ".\Debug\dcc.sbr"
 ".\Debug\device.sbr"
 ".\Debug\dlmstp.sbr"
@@ -217,6 +180,7 @@ Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP36.tmp" with conten
 ".\Debug\main.sbr"
 ".\Debug\mso.sbr"
 ".\Debug\mstp.sbr"
+".\Debug\mstptext.sbr"
 ".\Debug\noserv.sbr"
 ".\Debug\npdu.sbr"
 ".\Debug\reject.sbr"
@@ -231,14 +195,14 @@ Creating temporary file "C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP36.tmp" with conten
 ".\Debug\version.sbr"
 ".\Debug\whois.sbr"
 ".\Debug\wp.sbr"]
-Creating command line "bscmake.exe @C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP36.tmp"
+Creating command line "bscmake.exe @C:\DOCUME~1\VMWare\LOCALS~1\Temp\RSP1B.tmp"
 Creating browse info file...
 <h3>Output Window</h3>
 
 
 
 <h3>Results</h3>
-bacnet.exe - 0 error(s), 0 warning(s)
+bacnet.exe - 0 error(s), 4 warning(s)
 </pre>
 </body>
 </html>

bacnet-stack/ports/win32/net.h

@@ -38,7 +38,7 @@
 #include <sys/timeb.h>
 #include <process.h>
 
-#ifdef __MSC_VER
+#ifdef _MSC_VER
 #define inline __inline
 #endif