diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 12 | ||||
| -rw-r--r-- | ace/OS.h | 2 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/em3vcp.mpd | 2 |
4 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index cd509927296..54967f64df2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Fri Dec 27 17:43:29 2002 Steve Huston <shuston@riverace.com> + + * ace/OS.h: For WinCE, only typedef ptrdiff_t for _WIN32_WCE < 400. + eMbedded Visual C++ 4 (Win CE.NET) defines this type. + + * bin/MakeProjectCreator/templates/em3vcp.mpd: Removed /M$(CECrtMT) + from the CPP options. Neither evc3 nor 4 support any /M options to + set the C run-time like MSVC does. It's controlled via the _DEBUG + macro only. This also allows the generated vcp file to be used + with either evc3 or evc4 (Windows CE .NET). evc3 ignored the option, + but evc4 flags it as unknown. + Fri Dec 27 08:38:29 2002 Nanbor Wang <nanbor@cs.wustl.edu> * ace/MEM_IO.cpp (recv_buf): Changed to return error (-1) and set diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index cd509927296..54967f64df2 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Fri Dec 27 17:43:29 2002 Steve Huston <shuston@riverace.com> + + * ace/OS.h: For WinCE, only typedef ptrdiff_t for _WIN32_WCE < 400. + eMbedded Visual C++ 4 (Win CE.NET) defines this type. + + * bin/MakeProjectCreator/templates/em3vcp.mpd: Removed /M$(CECrtMT) + from the CPP options. Neither evc3 nor 4 support any /M options to + set the C run-time like MSVC does. It's controlled via the _DEBUG + macro only. This also allows the generated vcp file to be used + with either evc3 or evc4 (Windows CE .NET). evc3 ignored the option, + but evc4 flags it as unknown. + Fri Dec 27 08:38:29 2002 Nanbor Wang <nanbor@cs.wustl.edu> * ace/MEM_IO.cpp (recv_buf): Changed to return error (-1) and set @@ -1275,7 +1275,9 @@ struct cancel_state # if defined (ACE_HAS_WINCE) # include /**/ <types.h> +# if (_WIN32_WCE < 400) typedef unsigned long ptrdiff_t; // evc3, PocketPC don't defined ptrdiff_t +# endif //typedef DWORD nlink_t; diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd index b9cf2a0952f..0069e43a9af 100644 --- a/bin/MakeProjectCreator/templates/em3vcp.mpd +++ b/bin/MakeProjectCreator/templates/em3vcp.mpd @@ -61,7 +61,7 @@ LINK32=link.exe -lib RSC=rc.exe # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines)%> /d <%define%>=1<%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r CPP=<%cpp("cl.exe")%> -# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /M$(CECrtMT) /FD /c +# ADD CPP /nologo <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%>/D <%dllflag%>=1 <%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%>/D <%libflag%>=1 <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c <%if(compile_flags_removed)%> # SUBTRACT CPP <%compile_flags_removed%> <%endif%> |