diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-21 08:14:15 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-21 08:14:15 +0000 |
commit | 9a038f96520d143da7b20c29bf084eea05bb2e61 (patch) | |
tree | 5093f08bf9030f3f95d790208668e59c1a93efda | |
parent | 6fb30cb027e69345ae38e457ac19188713a458b8 (diff) | |
download | ATCD-9a038f96520d143da7b20c29bf084eea05bb2e61.tar.gz |
Wed Feb 21 08:13:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | ACE/ChangeLog | 7 | ||||
-rw-r--r-- | ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp | 2 | ||||
-rw-r--r-- | ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp | 2 | ||||
-rw-r--r-- | ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9009e0bd251..508e76ffda8 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Wed Feb 21 08:13:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server.cpp: + Fixed compile problems when wchar is enabled + Tue Feb 20 19:15:30 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> * tests/run_test.lst: diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp index 83333ccc357..b5f6b7f914e 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp @@ -204,7 +204,7 @@ main (int, char *[]) } #else #include "ace/OS_NS_stdio.h" -int main (int, char *[]) +int ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_OS::fprintf (stderr, "This feature is not supported\n"); return 0; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp index 22535160cf0..6be3ce47b9e 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp @@ -355,7 +355,7 @@ run_event_loop (u_short port) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { u_short port = ACE_DEFAULT_SERVER_PORT; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp index 8563067af03..c1f173cd72f 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp @@ -414,7 +414,7 @@ run_event_loop (u_short port) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_SSL_Context *context = ACE_SSL_Context::instance (); |