Skip to content

Commit e516220

Browse files
committed
Merge remote-tracking branch 'Palakis/bugfix/windows-export-lib' into master
2 parents 8340c07 + 19a37c6 commit e516220

5 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/ActiveSocket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class CPassiveSocket;
5151
/// An active socket is used to create a socket which connects to a server.
5252
/// This type of object would be used when an application needs to send/receive
5353
/// data from a server.
54-
class CActiveSocket : public CSimpleSocket {
54+
class EXPORT CActiveSocket : public CSimpleSocket {
5555
public:
5656
friend class CPassiveSocket;
5757

src/Host.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@ extern "C"
250250
#define FPRINTF fprintf
251251
#endif
252252

253+
#ifdef _MSC_VER
254+
#define EXPORT __declspec(dllexport)
255+
#else
256+
#define EXPORT
257+
#endif
258+
253259
#ifdef __cplusplus
254260
}
255261
#endif

src/PassiveSocket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
/// in a similar fashion. The big difference is that the method
5353
/// CPassiveSocket::Accept should not be called on the latter two socket
5454
/// types.
55-
class CPassiveSocket : public CSimpleSocket {
55+
class EXPORT CPassiveSocket : public CSimpleSocket {
5656
public:
5757
CPassiveSocket(CSocketType type = SocketTypeTcp);
5858
virtual ~CPassiveSocket() {

src/SimpleSocket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
/// - Socket types
100100
/// -# CActiveSocket Class
101101
/// -# CPassiveSocket Class
102-
class CSimpleSocket {
102+
class EXPORT CSimpleSocket {
103103
public:
104104
/// Defines the three possible states for shuting down a socket.
105105
typedef enum

src/StatTimer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
/// Class to abstract socket communications in a cross platform manner.
7070
/// This class is designed
71-
class CStatTimer {
71+
class EXPORT CStatTimer {
7272
public:
7373
CStatTimer()
7474
{

0 commit comments

Comments
 (0)