Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
28514815
Commit
28514815
authored
Oct 23, 2017
by
Dominik Charousset
Committed by
GitHub
Oct 23, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #614
Fix build with OpenSSL enabled on windows
parents
9f87c071
ae47252f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
libcaf_io/caf/io/network/default_multiplexer.hpp
libcaf_io/caf/io/network/default_multiplexer.hpp
+1
-1
libcaf_openssl/test/authentication.cpp
libcaf_openssl/test/authentication.cpp
+13
-2
libcaf_openssl/test/remote_actor.cpp
libcaf_openssl/test/remote_actor.cpp
+2
-0
No files found.
libcaf_io/caf/io/network/default_multiplexer.hpp
View file @
28514815
...
...
@@ -59,8 +59,8 @@
# define WINVER WindowsVista
# include <w32api.h>
# endif
# include <windows.h>
# include <winsock2.h>
# include <windows.h>
# include <ws2tcpip.h>
# include <ws2ipdef.h>
#else
...
...
libcaf_openssl/test/authentication.cpp
View file @
28514815
...
...
@@ -22,7 +22,14 @@
#define CAF_SUITE openssl_authentication
#include "caf/test/unit_test.hpp"
#include <unistd.h>
#ifndef CAF_WINDOWS
# include <unistd.h>
#else
# include <io.h>
# include <windows.h>
# define F_OK 0
# define PATH_MAX MAX_PATH
#endif
#include <vector>
#include <sstream>
...
...
@@ -60,10 +67,14 @@ public:
// TODO: https://github.com/actor-framework/actor-framework/issues/555
path
+=
"/../../libcaf_openssl/test"
;
char
rpath
[
PATH_MAX
];
#ifndef CAF_WINDOWS
auto
rp
=
realpath
(
path
.
c_str
(),
rpath
);
#else
auto
rp
=
GetFullPathName
(
path
.
c_str
(),
PATH_MAX
,
rpath
,
nullptr
);
#endif
std
::
string
result
;
if
(
rp
)
result
=
rp
;
result
=
rp
ath
;
return
result
;
}
};
...
...
libcaf_openssl/test/remote_actor.cpp
View file @
28514815
...
...
@@ -56,7 +56,9 @@ struct fixture {
config
client_side_config
;
actor_system
client_side
{
client_side_config
};
fixture
()
{
#ifdef CAF_LINUX
signal
(
SIGPIPE
,
SIG_IGN
);
#endif
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment