Skip to content

Commit

Permalink
Merge remote-tracking branch 'Palakis/bugfix/windows-export-lib' into…
Browse files Browse the repository at this point in the history
… master
  • Loading branch information
lethosor committed Aug 8, 2020
2 parents 8340c07 + 19a37c6 commit e516220
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/ActiveSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class CPassiveSocket;
/// An active socket is used to create a socket which connects to a server.
/// This type of object would be used when an application needs to send/receive
/// data from a server.
class CActiveSocket : public CSimpleSocket {
class EXPORT CActiveSocket : public CSimpleSocket {
public:
friend class CPassiveSocket;

Expand Down
6 changes: 6 additions & 0 deletions src/Host.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@ extern "C"
#define FPRINTF fprintf
#endif

#ifdef _MSC_VER
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#endif

#ifdef __cplusplus
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/PassiveSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
/// in a similar fashion. The big difference is that the method
/// CPassiveSocket::Accept should not be called on the latter two socket
/// types.
class CPassiveSocket : public CSimpleSocket {
class EXPORT CPassiveSocket : public CSimpleSocket {
public:
CPassiveSocket(CSocketType type = SocketTypeTcp);
virtual ~CPassiveSocket() {
Expand Down
2 changes: 1 addition & 1 deletion src/SimpleSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
/// - Socket types
/// -# CActiveSocket Class
/// -# CPassiveSocket Class
class CSimpleSocket {
class EXPORT CSimpleSocket {
public:
/// Defines the three possible states for shuting down a socket.
typedef enum
Expand Down
2 changes: 1 addition & 1 deletion src/StatTimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

/// Class to abstract socket communications in a cross platform manner.
/// This class is designed
class CStatTimer {
class EXPORT CStatTimer {
public:
CStatTimer()
{
Expand Down

0 comments on commit e516220

Please sign in to comment.