diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-03-01 06:34:58 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-03-01 06:34:58 +0000 |
| commit | ec93f53c1be126a7114eedff0afb707fa203d871 (patch) | |
| tree | 832e3ac21c7c70281c999a4ff37537502693da1f /ace | |
| parent | bcdd1e1eee85c6f5e6a1c178640fecc88bd8350c (diff) | |
| download | ATCD-ec93f53c1be126a7114eedff0afb707fa203d871.tar.gz | |
ChangeLogTag: Fri Mar 01 07:32:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Makefile.bor | 1 | ||||
| -rw-r--r-- | ace/SSL/SSL_Context.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ace/Makefile.bor b/ace/Makefile.bor index d3c4846207d..7ff5a1e28ce 100644 --- a/ace/Makefile.bor +++ b/ace/Makefile.bor @@ -268,6 +268,7 @@ INCLUDES = \ Stream_Modules.cpp \ String_Base.cpp \ Svc_Handler.cpp \ + Swap.cpp \ Test_and_Set.cpp \ Timer_Queue_Adapters.cpp \ Typed_SV_Message.cpp \ diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index c7a27309619..32820e4f025 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -461,7 +461,7 @@ ACE_SSL_Context::dh_params (const char *file_name, DH *ret=0; FILE *dhfp = 0; - if ((dhfp = ACE_OS::fopen (this->dh_params_.file_name (), ACE_TEXT ("r"))) == NULL) + if ((dhfp = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(this->dh_params_.file_name ()), ACE_TEXT ("r"))) == NULL) return -1; ret = PEM_read_DHparams (dhfp, NULL, NULL, NULL); |