diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-20 16:47:38 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-20 16:47:38 +0000 |
| commit | 9ba05cb0fa8047e6821cc3701111b5e63d466421 (patch) | |
| tree | 943dc0e9958ae03bb671d373c5c873e763673047 | |
| parent | 56f49b9a2a3de16339acf5a0a00e58a38a7a4f95 (diff) | |
| download | ATCD-9ba05cb0fa8047e6821cc3701111b5e63d466421.tar.gz | |
Mon Apr 20 17:47:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/WFMO_Reactor.cpp:
Fixed argument not used warning with WinCE
* include/makeinclude/platform_gnuwin32_common.GNU:
dlltool is also dependent on architecture
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/WFMO_Reactor.cpp | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_gnuwin32_common.GNU | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 44eab16af96..612752dcfcd 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Mon Apr 20 17:47:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/WFMO_Reactor.cpp: + Fixed argument not used warning with WinCE + + * include/makeinclude/platform_gnuwin32_common.GNU: + dlltool is also dependent on architecture + Mon Apr 20 17:43:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Sock_Connect.cpp: diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index d498cc77da8..61c063c41d0 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1756,6 +1756,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, // grab the lock and recheck the ok_to_wait_ event. When we can get them // both, or there's an error/timeout, return. #if defined (ACE_HAS_WINCE) + ACE_UNUSED_ARG (alertable); ACE_Time_Value timeout; if (max_wait_time != 0) { diff --git a/ACE/include/makeinclude/platform_gnuwin32_common.GNU b/ACE/include/makeinclude/platform_gnuwin32_common.GNU index 417e4be26f0..de156198b5d 100644 --- a/ACE/include/makeinclude/platform_gnuwin32_common.GNU +++ b/ACE/include/makeinclude/platform_gnuwin32_common.GNU @@ -32,7 +32,7 @@ endif CC = ${COMPARCH}gcc CXX = ${COMPARCH}g++ RC = ${COMPARCH}windres -DLLTOOL = dlltool +DLLTOOL = ${COMPARCH}dlltool RC_OUTPUT_FLAG = -o |